diff options
| author | Robert Gemmell <robbie@apache.org> | 2010-09-14 11:57:29 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2010-09-14 11:57:29 +0000 |
| commit | dfafe46469e029a1f1577f509c263a8ac595a4dc (patch) | |
| tree | 48442caece57e402628c17c9fbfa1f8df9b4c215 /qpid/java | |
| parent | 8c8130d0288446f88deef393823cccffcaed474d (diff) | |
| download | qpid-python-dfafe46469e029a1f1577f509c263a8ac595a4dc.tar.gz | |
QPID-2749: add -XX:+ExplicitGCInvokesConcurrent arg to ensure that the GCs prompted by the RMI runtime dont stop the world
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@996855 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
| -rwxr-xr-x | qpid/java/broker/bin/qpid-server | 2 | ||||
| -rw-r--r-- | qpid/java/broker/bin/qpid-server.bat | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/qpid/java/broker/bin/qpid-server b/qpid/java/broker/bin/qpid-server index 0b0dd41169..72829f3e5b 100755 --- a/qpid/java/broker/bin/qpid-server +++ b/qpid/java/broker/bin/qpid-server @@ -29,7 +29,7 @@ QPID_LIBS=$QPID_HOME/lib/qpid-all.jar:$QPID_HOME/lib/bdbstore-launch.jar export JAVA=java \ JAVA_VM=-server \ JAVA_MEM=-Xmx1024m \ - JAVA_GC="-XX:+UseConcMarkSweepGC -XX:+HeapDumpOnOutOfMemoryError" \ + JAVA_GC="-XX:+UseConcMarkSweepGC -XX:+HeapDumpOnOutOfMemoryError -XX:+ExplicitGCInvokesConcurrent" \ QPID_CLASSPATH=$QPID_LIBS \ QPID_RUN_LOG=2 diff --git a/qpid/java/broker/bin/qpid-server.bat b/qpid/java/broker/bin/qpid-server.bat index 5ca3a1d678..96d58cfa94 100644 --- a/qpid/java/broker/bin/qpid-server.bat +++ b/qpid/java/broker/bin/qpid-server.bat @@ -165,9 +165,7 @@ REM end parsing -run arguments set JAVA_VM=-server
set JAVA_MEM=-Xmx1024m
-set JAVA_GC=-XX:+UseConcMarkSweepGC
-rem removing the following vm arg from JAVA_GC as it is supported on ly in Java 1.6
-rem -XX:+HeapDumpOnOutOfMemoryError"
+set JAVA_GC=-XX:+UseConcMarkSweepGC -XX:+HeapDumpOnOutOfMemoryError -XX:+ExplicitGCInvokesConcurrent
REM Use QPID_JAVA_GC if set
if "%QPID_JAVA_GC%" == "" goto noQpidJavaGC
|