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 | 41d3eb8a87ac465f9e0e8a6359224918a1930e44 (patch) | |
| tree | 0f7231c86c2b16c0ad70dc4993d6aa715c963fdf /java/broker | |
| parent | b2121822d362463b22124da58f8c760d1149959f (diff) | |
| download | qpid-python-41d3eb8a87ac465f9e0e8a6359224918a1930e44.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/qpid@996855 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker')
| -rwxr-xr-x | java/broker/bin/qpid-server | 2 | ||||
| -rw-r--r-- | java/broker/bin/qpid-server.bat | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/java/broker/bin/qpid-server b/java/broker/bin/qpid-server index 0b0dd41169..72829f3e5b 100755 --- a/java/broker/bin/qpid-server +++ b/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/java/broker/bin/qpid-server.bat b/java/broker/bin/qpid-server.bat index 5ca3a1d678..96d58cfa94 100644 --- a/java/broker/bin/qpid-server.bat +++ b/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
|