summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorKeith Wall <kwall@apache.org>2014-07-22 10:09:32 +0000
committerKeith Wall <kwall@apache.org>2014-07-22 10:09:32 +0000
commitcbc9c9f2384cd07db7a120f94f81f54e3bd303a1 (patch)
treeced16f53d53a74f8ca852d875aecbf2892d67fe2 /java
parent802a192c035d7e97750ed7c3185543911b6d7756 (diff)
downloadqpid-python-cbc9c9f2384cd07db7a120f94f81f54e3bd303a1.tar.gz
QPID-5911: [Java Broker] Increase default maximum heap size from 1g to 2g
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1612526 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
-rwxr-xr-xjava/broker/bin/qpid-server2
-rwxr-xr-xjava/broker/bin/qpid-server.bat2
2 files changed, 2 insertions, 2 deletions
diff --git a/java/broker/bin/qpid-server b/java/broker/bin/qpid-server
index 8d4c56381b..c4709b110d 100755
--- a/java/broker/bin/qpid-server
+++ b/java/broker/bin/qpid-server
@@ -39,7 +39,7 @@ QPID_LIBS="$QPID_HOME/lib/*:$QPID_HOME/lib/plugins/*:$QPID_HOME/lib/opt/*"
# Set other variables used by the qpid-run script before calling
export JAVA=java \
JAVA_VM=-server \
- JAVA_MEM=-Xmx1024m \
+ JAVA_MEM=-Xmx2g \
JAVA_GC="-XX:+UseConcMarkSweepGC -XX:+HeapDumpOnOutOfMemoryError" \
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 ea76a54479..9c3403edc7 100755
--- a/java/broker/bin/qpid-server.bat
+++ b/java/broker/bin/qpid-server.bat
@@ -164,7 +164,7 @@ REM end parsing -run arguments
:endRunArgs
set JAVA_VM=-server
-set JAVA_MEM=-Xmx1024m
+set JAVA_MEM=-Xmx2g
set JAVA_GC=-XX:+UseConcMarkSweepGC -XX:+HeapDumpOnOutOfMemoryError
REM Use QPID_JAVA_GC if set