You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2011/04/05 13:22:01 UTC
svn commit: r1088979 - /activemq/trunk/assembly/src/release/bin/activemq
Author: dejanb
Date: Tue Apr 5 11:22:00 2011
New Revision: 1088979
URL: http://svn.apache.org/viewvc?rev=1088979&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-3269 - ACTIVEMQ_MEMORY_OPTS
Modified:
activemq/trunk/assembly/src/release/bin/activemq
Modified: activemq/trunk/assembly/src/release/bin/activemq
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/bin/activemq?rev=1088979&r1=1088978&r2=1088979&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/bin/activemq (original)
+++ activemq/trunk/assembly/src/release/bin/activemq Tue Apr 5 11:22:00 2011
@@ -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
;;