This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new a7da104 63765: Properly mark container as FAILED when a JVM error
occurs on stop # Conflicts: # webapps/docs/changelog.xml
a7da104 is described below
commit a7da104b7e1e80e758807d463e4234dd57a64d85
Author: remm <r...@apache.org>
AuthorDate: Fri Oct 11 18:12:53 2019 +0200
63765: Properly mark container as FAILED when a JVM error occurs on stop
# Conflicts:
# webapps/docs/changelog.xml
---
java/org/apache/catalina/util/LifecycleBase.java | 2 +-
webapps/docs/changelog.xml | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/util/LifecycleBase.java
b/java/org/apache/catalina/util/LifecycleBase.java
index 8ea4d65..870cb9a 100644
--- a/java/org/apache/catalina/util/LifecycleBase.java
+++ b/java/org/apache/catalina/util/LifecycleBase.java
@@ -432,8 +432,8 @@ public abstract class LifecycleBase implements Lifecycle {
private void handleSubClassException(Throwable t, String key, Object...
args) throws LifecycleException {
- ExceptionUtils.handleThrowable(t);
setStateInternal(LifecycleState.FAILED, null, false);
+ ExceptionUtils.handleThrowable(t);
String msg = sm.getString(key, args);
if (getThrowOnFailure()) {
if (!(t instanceof LifecycleException)) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8ba4b26..ab69483 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -45,6 +45,14 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 8.5.48 (markt)" rtext="in development">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ <bug>63765</bug>: Properly mark container as FAILED when a JVM error
+ occurs on stop. (remm)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Coyote">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
