Author: markt
Date: Tue Jan 19 22:38:38 2016
New Revision: 1725635
URL: http://svn.apache.org/viewvc?rev=1725635&view=rev
Log:
Fix test failures
Automatically calling stop() after start() failed triggered multiple
failures to revert that part of the refactoring in r1725599
Modified:
tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java
Modified: tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java?rev=1725635&r1=1725634&r2=1725635&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java Tue Jan 19
22:38:38 2016
@@ -154,11 +154,6 @@ public abstract class LifecycleBase impl
ExceptionUtils.handleThrowable(t);
setStateInternal(LifecycleState.FAILED, null, false);
throw new
LifecycleException(sm.getString("lifecycleBase.startFail", toString()), t);
- } finally {
- if (state.equals(LifecycleState.FAILED)) {
- stop();
- return;
- }
}
// Shouldn't be necessary but acts as a check that sub-classes are
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
