From ced8ba2addfa3249d7c8db976e54a61dea4c2a3f Mon Sep 17 00:00:00 2001 From: jbertram Date: Mon, 14 Dec 2015 15:22:32 -0600 Subject: [PATCH] ARTEMIS-318 use profile JAVA_ARGS only for 'run' --- .../org/apache/activemq/artemis/cli/commands/bin/artemis | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis index a81cf1944cd..133f69aaae5 100755 --- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis +++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis @@ -105,6 +105,11 @@ if $cygwin ; then CLASSPATH=`cygpath --windows "$CLASSPATH"` fi +# Empty JAVA_ARGS unless the command is 'run' or 'data'. See https://issues.apache.org/jira/browse/ARTEMIS-318. +if [ $1 != "run" -a $1 != "data" ]; then + JAVA_ARGS="" +fi + exec "$JAVACMD" $JAVA_ARGS $ARTEMIS_CLUSTER_PROPS \ -classpath "$CLASSPATH" \ -Dartemis.home="$ARTEMIS_HOME" \