This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push: new 211006a 63765: Properly mark container as FAILED when a JVM error occurs on stop # Conflicts: # webapps/docs/changelog.xml 211006a is described below commit 211006a152cdbd6e594ef037caec6d409153889e 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 4b9bc2a..c2ddf43 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 82b4cc0..f87315d 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -60,6 +60,14 @@ issues do not "pop up" wrt. others). --> <section name="Tomcat 7.0.98 (violetagg)"> + <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