From aa24935f7bd438333e19d30dd9a890a75ba7baf4 Mon Sep 17 00:00:00 2001
From: Bosanac Dejan <dejanb@apache.org>
Date: Tue, 5 Apr 2011 11:22:00 +0000
Subject: [PATCH] https://issues.apache.org/jira/browse/AMQ-3269 -
 ACTIVEMQ_MEMORY_OPTS

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1088979 13f79535-47bb-0310-9956-ffa450edef68
---
 assembly/src/release/bin/activemq | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/assembly/src/release/bin/activemq b/assembly/src/release/bin/activemq
index c159d11bc6..66c6f7dc81 100755
--- a/assembly/src/release/bin/activemq
+++ b/assembly/src/release/bin/activemq
@@ -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
            ;;