activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [1/2] activemq-artemis git commit: ARTEMIS-318 use profile JAVA_ARGS only for 'run'
Date Tue, 15 Dec 2015 15:42:49 GMT
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 2a1b974a9 -> 61b76dc1f


ARTEMIS-318 use profile JAVA_ARGS only for 'run'


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/ced8ba2a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/ced8ba2a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/ced8ba2a

Branch: refs/heads/master
Commit: ced8ba2addfa3249d7c8db976e54a61dea4c2a3f
Parents: 2a1b974
Author: jbertram <jbertram@apache.org>
Authored: Mon Dec 14 15:22:32 2015 -0600
Committer: jbertram <jbertram@apache.org>
Committed: Tue Dec 15 09:32:50 2015 -0600

----------------------------------------------------------------------
 .../org/apache/activemq/artemis/cli/commands/bin/artemis        | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ced8ba2a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
----------------------------------------------------------------------
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 a81cf19..133f69a 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" \


Mime
View raw message