From ce96605a25ebb756168a3c2d6ef3eda734c8e9fa Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 13 May 2008 20:13:22 +0000
Subject: [PATCH] =?utf8?q?Fix=20https://issues.apache.org/bugzilla/show=5F?=
 =?utf8?q?bug.cgi=3Fid=3D44988=20Use=20Java=205=20syntax=20to=20start=20de?=
 =?utf8?q?bugger.=20Patch=20provided=20by=20C=C3=A9drik=20Lime.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@655992 13f79535-47bb-0310-9956-ffa450edef68
---
 bin/catalina.bat | 2 +-
 bin/catalina.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/catalina.bat b/bin/catalina.bat
index 70673a247..b0c455710 100755
--- a/bin/catalina.bat
+++ b/bin/catalina.bat
@@ -149,7 +149,7 @@ if not "%JPDA_SUSPEND%" == "" goto gotJpdaSuspend
 set JPDA_SUSPEND=n
 :gotJpdaSuspend
 if not "%JPDA_OPTS%" == "" goto gotJpdaOpts
-set JPDA_OPTS=-Xdebug -Xrunjdwp:transport=%JPDA_TRANSPORT%,address=%JPDA_ADDRESS%,server=y,suspend=%JPDA_SUSPEND%
+set JPDA_OPTS=-agentlib:jdwp=transport=%JPDA_TRANSPORT%,address=%JPDA_ADDRESS%,server=y,suspend=%JPDA_SUSPEND%
 :gotJpdaOpts
 shift
 :noJpda
diff --git a/bin/catalina.sh b/bin/catalina.sh
index 109f3c126..c2f795c10 100755
--- a/bin/catalina.sh
+++ b/bin/catalina.sh
@@ -210,7 +210,7 @@ if [ "$1" = "jpda" ] ; then
     JPDA_SUSPEND="n"
   fi
   if [ -z "$JPDA_OPTS" ]; then
-    JPDA_OPTS="-Xdebug -Xrunjdwp:transport=$JPDA_TRANSPORT,address=$JPDA_ADDRESS,server=y,suspend=$JPDA_SUSPEND"
+    JPDA_OPTS="-agentlib:jdwp=transport=$JPDA_TRANSPORT,address=$JPDA_ADDRESS,server=y,suspend=$JPDA_SUSPEND"
   fi
   CATALINA_OPTS="$CATALINA_OPTS $JPDA_OPTS"
   shift
-- 
2.11.0