From c20003c6f6a5a790977129a5d1b7dc255db1f035 Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Sun, 3 Jul 2011 16:55:33 +0000 Subject: QPID-2655: update to allow -run:jpda option to work Applied patch from Danushka Menikkumbura git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1142460 13f79535-47bb-0310-9956-ffa450edef68 --- java/broker/bin/qpid-server.bat | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'java') diff --git a/java/broker/bin/qpid-server.bat b/java/broker/bin/qpid-server.bat index c81f5fc3e7..af543decb3 100644 --- a/java/broker/bin/qpid-server.bat +++ b/java/broker/bin/qpid-server.bat @@ -108,13 +108,13 @@ goto beforeRunShift :runJdpa REM USAGE: adds debugging options to the java command, use -REM USAGE: JDPA_TRANSPORT and JPDA_ADDRESS to customize the debugging +REM USAGE: JPDA_TRANSPORT and JPDA_ADDRESS to customize the debugging REM USAGE: behavior and use JPDA_OPTS to override it entirely -if "%JPDA_OPTS%" == "" goto beforeRunShift -if "%JPDA_TRANSPORT%" == "" set JPDA_TRANSPORT=-dt_socket +if not "%JPDA_OPTS%" == "" goto beforeRunShift +if "%JPDA_TRANSPORT%" == "" set JPDA_TRANSPORT=dt_socket if "%JPDA_ADDRESS%" == "" set JPDA_ADDRESS=8000 -set JPDA_OPTS="-Xdebug -Xrunjdwp:transport=%JPDA_TRANSPORT%,address=%JPDA_ADDRESS%,server=y,suspend=n" -set QPID_OPTS="%QPID_OPTS% %JPDA_OPTS%" +set JPDA_OPTS=-Xdebug -Xrunjdwp:transport=%JPDA_TRANSPORT%,address=%JPDA_ADDRESS%,server=y,suspend=n +REM set QPID_OPTS="%QPID_OPTS% %JPDA_OPTS%" goto beforeRunShift :runExternalClasspath @@ -192,7 +192,7 @@ rem QPID_OPTS intended to hold any -D props for use rem user must enclose any value for QPID_OPTS in double quotes :runCommand set MODULE_JARS=%QPID_MODULE_JARS% -set COMMAND="%JAVA_HOME%\bin\java" %JAVA_VM% %JAVA_MEM% %JAVA_GC% %QPID_OPTS% %SYSTEM_PROPS% -cp "%CLASSPATH%;%MODULE_JARS%" org.apache.qpid.server.Main %QPID_ARGS% +set COMMAND="%JAVA_HOME%\bin\java" %JAVA_VM% %JAVA_MEM% %JAVA_GC% %QPID_OPTS% %JPDA_OPTS% %SYSTEM_PROPS% -cp "%CLASSPATH%;%MODULE_JARS%" org.apache.qpid.server.Main %QPID_ARGS% if "%debug%" == "true" echo %CLASSPATH%;%LAUNCH_JAR%;%MODULE_JARS% if "%debug%" == "true" echo %COMMAND% -- cgit v1.2.1