This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new c31e02b Complete the fix for BZ 63815
c31e02b is described below
commit c31e02b1f4f4f4a8d2684be359ab6a8a10671d6a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Oct 2 13:28:44 2020 +0100
Complete the fix for BZ 63815
https://bz.apache.org/bugzilla/show_bug.cgi?id=63815
Note that users that wish to pass quoted system properties when using
debug *must* use a JRE that includes the fix for
https://bugs.openjdk.java.net/browse/JDK-8234808
---
bin/catalina.sh | 8 ++------
webapps/docs/changelog.xml | 7 +++++++
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/bin/catalina.sh b/bin/catalina.sh
index 39ce2e1..05e2fa2 100755
--- a/bin/catalina.sh
+++ b/bin/catalina.sh
@@ -352,10 +352,6 @@ if [ "$1" = "jpda" ] ; then
shift
fi
-# TODO: Bugzilla 63815
-# This doesn't currently work (and can't be made to work) if values used in
-# CATALINA_OPTS and/or JAVA_OPTS require quoting. See:
-# https://bugs.openjdk.java.net/browse/JDK-8234808
if [ "$1" = "debug" ] ; then
if $os400; then
echo "Debug command not available on OS400"
@@ -367,7 +363,7 @@ if [ "$1" = "debug" ] ; then
echo "Using Security Manager"
fi
shift
- exec "$_RUNJDB" "$CATALINA_LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS
$CATALINA_OPTS \
+ eval exec "\"$_RUNJDB\"" "\"$CATALINA_LOGGING_CONFIG\"" $LOGGING_MANAGER
"$JAVA_OPTS" "$CATALINA_OPTS" \
-D$ENDORSED_PROP="$JAVA_ENDORSED_DIRS" \
-classpath "$CLASSPATH" \
-sourcepath "$CATALINA_HOME"/../../java \
@@ -378,7 +374,7 @@ if [ "$1" = "debug" ] ; then
-Djava.io.tmpdir="$CATALINA_TMPDIR" \
org.apache.catalina.startup.Bootstrap "$@" start
else
- exec "$_RUNJDB" "$CATALINA_LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS
$CATALINA_OPTS \
+ eval exec "\"$_RUNJDB\"" "\"$CATALINA_LOGGING_CONFIG\"" $LOGGING_MANAGER
"$JAVA_OPTS" "$CATALINA_OPTS" \
-D$ENDORSED_PROP="$JAVA_ENDORSED_DIRS" \
-classpath "$CLASSPATH" \
-sourcepath "$CATALINA_HOME"/../../java \
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 09bd6c5..b343085 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -207,6 +207,13 @@
Fix running service.bat when called from <code>$CATALINA_HOME</code>.
(markt)
</fix>
+ <fix>
+ Complete the fix for <bug>63815</bug>. Users wishing to use system
+ properties that require quoting with <code>catalina.sh</code> and the
+ <code>debug</code> option must use a JRE that includes the fix for <a
+
href="https://bugs.openjdk.java.net/browse/JDK-8234808";>JDK-8234808</a>.
+ (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
