summaryrefslogtreecommitdiff
path: root/java/broker
diff options
context:
space:
mode:
authorRupert Smith <rupertlssmith@apache.org>2007-05-14 11:47:13 +0000
committerRupert Smith <rupertlssmith@apache.org>2007-05-14 11:47:13 +0000
commit72197a8f0b5b39c7931d0a85fdd2426115456acb (patch)
tree79c4a7bc4a8c75c5e36f0f98c88195f3e00e33c1 /java/broker
parent736eb917ebd8a1a007dde5af12257b390ae40108 (diff)
downloadqpid-python-72197a8f0b5b39c7931d0a85fdd2426115456acb.tar.gz
Merged revisions 536571-536583,536586-536823,536825-537014,537016-537018,537020-537025,537027-537028,537030-537160,537162-537170,537172-537672,537674-537782 via svnmerge from
https://svn.apache.org/repos/asf/incubator/qpid/branches/M2 ........ r536571 | ritchiem | 2007-05-09 16:46:57 +0100 (Wed, 09 May 2007) | 1 line QPID-484 Provided default GC and easy customisation.. via setting QPID_JAVA_QC. ........ r536573 | rgreig | 2007-05-09 16:48:11 +0100 (Wed, 09 May 2007) | 1 line Corrected mistaked in test parameters. ........ r537782 | rupertlssmith | 2007-05-14 12:37:41 +0100 (Mon, 14 May 2007) | 1 line Added to the Javadoc. ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@537789 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker')
-rw-r--r--java/broker/bin/qpid-server1
1 files changed, 1 insertions, 0 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 "$@"