From 72197a8f0b5b39c7931d0a85fdd2426115456acb Mon Sep 17 00:00:00 2001
From: Rupert Smith <rupertlssmith@apache.org>
Date: Mon, 14 May 2007 11:47:13 +0000
Subject: 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
---
 java/common/bin/qpid-run | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'java/common/bin')

diff --git a/java/common/bin/qpid-run b/java/common/bin/qpid-run
index fc607529ee..c9e37b21a1 100644
--- a/java/common/bin/qpid-run
+++ b/java/common/bin/qpid-run
@@ -114,6 +114,15 @@ else
     echo "Warning: Qpid classpath not set. CLASSPATH must include qpid jars."
 fi
 
+#Use QPID_JAVA_GC if set
+if [ -n "$QPID_JAVA_GC" ]; then
+    export JAVA_GC=$QPID_JAVA_GC
+    echo "Using QPID_JAVA_GC setting" $QPID_JAVA_GC
+else
+    echo "Info: QPID_JAVA_GC not set. Defaulting to JAVA_GC" $JAVA_GC
+fi
+
+
 #Use QPID_JAVA_MEM if set
 if [ -n "$QPID_JAVA_MEM" ]; then
     export JAVA_MEM=$QPID_JAVA_MEM
@@ -224,6 +233,6 @@ if $cygwin; then
   JAVA=$(cygpath -u $JAVA)
 fi
 
-COMMAND=($JAVA $JAVA_VM $JAVA_MEM $SYSTEM_PROPS $JAVA_OPTS $QPID_OPTS "${JAVA_ARGS[@]}")
+COMMAND=($JAVA $JAVA_VM $JAVA_GC $JAVA_MEM $SYSTEM_PROPS $JAVA_OPTS $QPID_OPTS "${JAVA_ARGS[@]}")
 
 DISPATCH
-- 
cgit v1.2.1