Author: rjung
Date: Sat May 23 15:57:28 2015
New Revision: 1681360
URL: http://svn.apache.org/r1681360
Log:
Revert r1681141. Was:
Log errors processing LifecycleListener events and continue rather
than allowing uncaught exception to propagate (BZ 57939).
"The bz issue needs a more careful look."
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/LifecycleSupport.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/LocalStrings.properties
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/LifecycleSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/LifecycleSupport.java?rev=1681360&r1=1681359&r2=1681360&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/LifecycleSupport.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/LifecycleSupport.java
Sat May 23 15:57:28 2015
@@ -22,10 +22,6 @@ package org.apache.catalina.util;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleListener;
-import org.apache.juli.logging.Log;
-import org.apache.juli.logging.LogFactory;
-import org.apache.tomcat.util.ExceptionUtils;
-import org.apache.tomcat.util.res.StringManager;
/**
@@ -36,12 +32,10 @@ import org.apache.tomcat.util.res.String
*/
public final class LifecycleSupport {
- private static final Log log = LogFactory.getLog(LifecycleSupport.class);
- private static final StringManager sm =
StringManager.getManager("org.apache.catalina.util");
-
// ----------------------------------------------------------- Constructors
+
/**
* Construct a new LifecycleSupport object associated with the specified
* Lifecycle component.
@@ -119,15 +113,9 @@ public final class LifecycleSupport {
LifecycleEvent event = new LifecycleEvent(lifecycle, type, data);
LifecycleListener interested[] = listeners;
- for (int i = 0; i < interested.length; i++) {
- try {
- interested[i].lifecycleEvent(event);
- } catch (Throwable t) {
- ExceptionUtils.handleThrowable(t);
- log.error(sm.getString("lifecycleBase.listenerFail",
- type, interested[i].getClass().getName()), t);
- }
- }
+ for (int i = 0; i < interested.length; i++)
+ interested[i].lifecycleEvent(event);
+
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/LocalStrings.properties?rev=1681360&r1=1681359&r2=1681360&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/LocalStrings.properties
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/LocalStrings.properties
Sat May 23 15:57:28 2015
@@ -30,7 +30,6 @@ lifecycleBase.destroyFail=Failed to dest
lifecycleBase.destroyStopFail=Calling stop() on failed component [{0}] to
trigger clean-up did not complete.
lifecycleBase.initFail=Failed to initialize component [{0}]
lifecycleBase.invalidTransition=An invalid Lifecycle transition was attempted
([{0}]) for component [{1}] in state [{2}]
-lifecycleBase.listenerFail=Failed to processes [{0}] event for an instance of
[{1}]
lifecycleBase.setState=Setting state for [{0}] to [{1}]
lifecycleBase.startFail=Failed to start component [{0}]
lifecycleBase.stopFail=Failed to stop component [{0}]
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
