From 2ebdadabc993f81f3b2113664fe82c5f0601c28f Mon Sep 17 00:00:00 2001 From: Bosanac Dejan Date: Tue, 5 Apr 2011 11:42:08 +0000 Subject: [PATCH] setting ACTIVEMQ_OPTS after loading configs git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1088989 13f79535-47bb-0310-9956-ffa450edef68 --- assembly/src/release/bin/activemq | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/assembly/src/release/bin/activemq b/assembly/src/release/bin/activemq index 66c6f7dc81..52a01eb3db 100755 --- a/assembly/src/release/bin/activemq +++ b/assembly/src/release/bin/activemq @@ -121,10 +121,6 @@ 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" -fi - # Uncomment to enable audit logging #ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS -Dorg.apache.activemq.audit=true" @@ -214,6 +210,10 @@ if [ "$CONFIG_LOAD" != "yes" ];then fi fi +if [ -z "$ACTIVEMQ_OPTS" ] ; then + ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS_MEMORY -Dorg.apache.activemq.UseDedicatedTaskRunner=true -Djava.util.logging.config.file=logging.properties" +fi + # create configuration if requested if [ "$1" = "setup" ];then if [ -z "$2" ];then