summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Donald Kennedy <grkvlt@apache.org>2010-10-04 10:05:04 +0000
committerAndrew Donald Kennedy <grkvlt@apache.org>2010-10-04 10:05:04 +0000
commit29ec6a102147f1cbed389a64ac81c90ce437a606 (patch)
treef5db136773203d351a2c5dccc5d206593834b090
parentcb5a819bd841c0af36ab4d13053a001a600a64d5 (diff)
downloadqpid-python-29ec6a102147f1cbed389a64ac81c90ce437a606.tar.gz
QPID-2749: Revert changes due to performance issues
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1004180 13f79535-47bb-0310-9956-ffa450edef68
-rwxr-xr-xqpid/java/broker/bin/qpid-server2
-rw-r--r--qpid/java/broker/bin/qpid-server.bat2
2 files changed, 2 insertions, 2 deletions
diff --git a/qpid/java/broker/bin/qpid-server b/qpid/java/broker/bin/qpid-server
index 318a83e4cc..90b11da202 100755
--- a/qpid/java/broker/bin/qpid-server
+++ b/qpid/java/broker/bin/qpid-server
@@ -40,7 +40,7 @@ QPID_LIBS=$QPID_HOME/lib/qpid-all.jar
export JAVA=java \
JAVA_VM=-server \
JAVA_MEM=-Xmx1024m \
- JAVA_GC="-XX:+UseConcMarkSweepGC -XX:+HeapDumpOnOutOfMemoryError -XX:+ExplicitGCInvokesConcurrent" \
+ JAVA_GC="-XX:+UseConcMarkSweepGC -XX:+HeapDumpOnOutOfMemoryError" \
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 29065907df..c81f5fc3e7 100644
--- a/qpid/java/broker/bin/qpid-server.bat
+++ b/qpid/java/broker/bin/qpid-server.bat
@@ -165,7 +165,7 @@ REM end parsing -run arguments
set JAVA_VM=-server
set JAVA_MEM=-Xmx1024m
-set JAVA_GC=-XX:+UseConcMarkSweepGC -XX:+HeapDumpOnOutOfMemoryError -XX:+ExplicitGCInvokesConcurrent
+set JAVA_GC=-XX:+UseConcMarkSweepGC -XX:+HeapDumpOnOutOfMemoryError
REM Use QPID_JAVA_GC if set
if "%QPID_JAVA_GC%" == "" goto noQpidJavaGC