diff options
| -rw-r--r-- | java/broker/bin/qpid-server | 1 | ||||
| -rw-r--r-- | java/common/bin/qpid-run | 11 |
2 files changed, 11 insertions, 1 deletions
diff --git a/java/broker/bin/qpid-server b/java/broker/bin/qpid-server index a2b416b12b..76d0ad786d 100644 --- a/java/broker/bin/qpid-server +++ b/java/broker/bin/qpid-server @@ -25,6 +25,7 @@ QPID_LIBS=$QPID_HOME/lib/qpid-incubating.jar:$QPID_HOME/lib/bdbstore-launch.jar export JAVA=java \ JAVA_VM=-server \ JAVA_MEM=-Xmx1024m \ + JAVA_GC=-XX:-UseConcMarkSweepGC QPID_CLASSPATH=$QPID_LIBS . qpid-run org.apache.qpid.server.Main "$@" diff --git a/java/common/bin/qpid-run b/java/common/bin/qpid-run index fc607529ee..c9e37b21a1 100644 --- a/java/common/bin/qpid-run +++ b/java/common/bin/qpid-run @@ -114,6 +114,15 @@ else echo "Warning: Qpid classpath not set. CLASSPATH must include qpid jars." fi +#Use QPID_JAVA_GC if set +if [ -n "$QPID_JAVA_GC" ]; then + export JAVA_GC=$QPID_JAVA_GC + echo "Using QPID_JAVA_GC setting" $QPID_JAVA_GC +else + echo "Info: QPID_JAVA_GC not set. Defaulting to JAVA_GC" $JAVA_GC +fi + + #Use QPID_JAVA_MEM if set if [ -n "$QPID_JAVA_MEM" ]; then export JAVA_MEM=$QPID_JAVA_MEM @@ -224,6 +233,6 @@ if $cygwin; then JAVA=$(cygpath -u $JAVA) fi -COMMAND=($JAVA $JAVA_VM $JAVA_MEM $SYSTEM_PROPS $JAVA_OPTS $QPID_OPTS "${JAVA_ARGS[@]}") +COMMAND=($JAVA $JAVA_VM $JAVA_GC $JAVA_MEM $SYSTEM_PROPS $JAVA_OPTS $QPID_OPTS "${JAVA_ARGS[@]}") DISPATCH |