You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2007/05/09 17:46:57 UTC
svn commit: r536571 - in /incubator/qpid/branches/M2/java:
broker/bin/qpid-server common/bin/qpid-run
Author: ritchiem
Date: Wed May 9 08:46:57 2007
New Revision: 536571
URL: http://svn.apache.org/viewvc?view=rev&rev=536571
Log:
QPID-484 Provided default GC and easy customisation.. via setting QPID_JAVA_QC.
Modified:
incubator/qpid/branches/M2/java/broker/bin/qpid-server
incubator/qpid/branches/M2/java/common/bin/qpid-run
Modified: incubator/qpid/branches/M2/java/broker/bin/qpid-server
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/broker/bin/qpid-server?view=diff&rev=536571&r1=536570&r2=536571
==============================================================================
--- incubator/qpid/branches/M2/java/broker/bin/qpid-server (original)
+++ incubator/qpid/branches/M2/java/broker/bin/qpid-server Wed May 9 08:46:57 2007
@@ -25,6 +25,7 @@
export JAVA=java \
JAVA_VM=-server \
JAVA_MEM=-Xmx1024m \
+ JAVA_GC=-XX:-UseConcMarkSweepGC
QPID_CLASSPATH=$QPID_LIBS
. qpid-run org.apache.qpid.server.Main "$@"
Modified: incubator/qpid/branches/M2/java/common/bin/qpid-run
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/common/bin/qpid-run?view=diff&rev=536571&r1=536570&r2=536571
==============================================================================
--- incubator/qpid/branches/M2/java/common/bin/qpid-run (original)
+++ incubator/qpid/branches/M2/java/common/bin/qpid-run Wed May 9 08:46:57 2007
@@ -114,6 +114,15 @@
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 @@
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