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 c741084 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63567
c741084 is described below
commit c74108449d035eff07ea93fdf7162de02668d19a
Author: Mark Thomas <[email protected]>
AuthorDate: Wed Jul 24 22:45:17 2019 +0100
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63567
Pass $LOGGING_MANAGER to jvm on stop
---
bin/catalina.sh | 2 +-
webapps/docs/changelog.xml | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/bin/catalina.sh b/bin/catalina.sh
index 4f84d57..23bb3b3 100755
--- a/bin/catalina.sh
+++ b/bin/catalina.sh
@@ -514,7 +514,7 @@ elif [ "$1" = "stop" ] ; then
fi
fi
- eval "\"$_RUNJAVA\"" $JAVA_OPTS \
+ eval "\"$_RUNJAVA\"" $LOGGING_MANAGER $JAVA_OPTS \
-D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \
-classpath "\"$CLASSPATH\"" \
-Dcatalina.base="\"$CATALINA_BASE\"" \
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5504dbc..69d70b5 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -168,6 +168,11 @@
Expand the coverage and quality of the French translations provided
with Apache Tomcat. (remm)
</add>
+ <fix>
+ <bug>63567</bug>: Restore the passing of <code>$LOGGING_MANAGER</code>
+ to the jvm in <code>catalina.sh</code> when calling <code>stop</code>.
+ (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
