From d9b960a27e6f8ed80fde54b4415a0bed3c472da4 Mon Sep 17 00:00:00 2001
From: burton <burton@spinn3r.com>
Date: Tue, 24 Feb 2015 19:44:19 -0800
Subject: [PATCH] Fix to only include the activemq opts for memory when start
 is called.  If we don't do this we end up potentially allocating too much
 memory if -Xms is a high value.

---
 assembly/src/release/bin/activemq | 2 +-
 assembly/src/release/bin/env      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/assembly/src/release/bin/activemq b/assembly/src/release/bin/activemq
index 100e0cd638b..a8c8d5b93d4 100755
--- a/assembly/src/release/bin/activemq
+++ b/assembly/src/release/bin/activemq
@@ -297,7 +297,7 @@ invokeJar(){
    fi
    # Execute java binary
    if [ -n "$PIDFILE" ] && [ "$PIDFILE" != "stop" ];then
-      $EXEC_OPTION $DOIT_PREFIX "\"$JAVACMD\" $ACTIVEMQ_OPTS $ACTIVEMQ_DEBUG_OPTS \
+      $EXEC_OPTION $DOIT_PREFIX "\"$JAVACMD\" $ACTIVEMQ_OPTS_MEMORY $ACTIVEMQ_OPTS $ACTIVEMQ_DEBUG_OPTS \
               -Dactivemq.classpath=\"${ACTIVEMQ_CLASSPATH}\" \
               -Dactivemq.home=\"${ACTIVEMQ_HOME}\" \
               -Dactivemq.base=\"${ACTIVEMQ_BASE}\" \
diff --git a/assembly/src/release/bin/env b/assembly/src/release/bin/env
index 436929308b4..465cbe7529c 100644
--- a/assembly/src/release/bin/env
+++ b/assembly/src/release/bin/env
@@ -24,7 +24,7 @@ if [ -z "$ACTIVEMQ_OPTS_MEMORY" ] ; then
 fi
 
 if [ -z "$ACTIVEMQ_OPTS" ] ; then
-    ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS_MEMORY -Djava.util.logging.config.file=logging.properties -Djava.security.auth.login.config=$ACTIVEMQ_CONF/login.config"
+    ACTIVEMQ_OPTS="-Djava.util.logging.config.file=logging.properties -Djava.security.auth.login.config=$ACTIVEMQ_CONF/login.config"
 fi
 
 # Uncomment to enable audit logging