This closes #265

2015-12-15 10:42:40 -05:00 · 2015-12-15 10:42:40 -05:00 · 61b76dc1f3
parent 2a1b974a95 ced8ba2add
commit 61b76dc1f3
1 changed files with 5 additions and 0 deletions
--- 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" \