git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1088979 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Bosanac Dejan 2011-04-05 11:22:00 +00:00
parent a345cd3d56
commit aa24935f7b
1 changed files with 4 additions and 2 deletions

View File

@ -117,7 +117,9 @@ JAVACMD="auto"
ACTIVEMQ_USER=""
# Set jvm memory configuration
ACTIVEMQ_OPTS_MEMORY="-Xms256M -Xmx256M"
if [ -z "$ACTIVEMQ_OPTS_MEMORY" ] ; then
ACTIVEMQ_OPTS_MEMORY="-Xms256M -Xmx256M"
fi
if [ -z "$ACTIVEMQ_OPTS" ] ; then
ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS_MEMORY -Dorg.apache.activemq.UseDedicatedTaskRunner=true -Djava.util.logging.config.file=logging.properties"
@ -249,7 +251,7 @@ case "`uname`" in
CYGWIN*) OSTYPE="cygwin" ;;
Darwin*)
OSTYPE="darwin"
if [-z "$JAVA_HOME"] && [ "$JAVACMD" = "auto" ];then
if [ -z "$JAVA_HOME" ] && [ "$JAVACMD" = "auto" ];then
JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
fi
;;