Author: markt
Date: Tue Jan 19 19:34:09 2016
New Revision: 1725600
URL: http://svn.apache.org/viewvc?rev=1725600&view=rev
Log:
Remove deprecated code
Modified:
tomcat/trunk/java/org/apache/catalina/LifecycleState.java
Modified: tomcat/trunk/java/org/apache/catalina/LifecycleState.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/LifecycleState.java?rev=1725600&r1=1725599&r2=1725600&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/LifecycleState.java (original)
+++ tomcat/trunk/java/org/apache/catalina/LifecycleState.java Tue Jan 19
19:34:09 2016
@@ -32,25 +32,7 @@ public enum LifecycleState {
STOPPED(false, Lifecycle.AFTER_STOP_EVENT),
DESTROYING(false, Lifecycle.BEFORE_DESTROY_EVENT),
DESTROYED(false, Lifecycle.AFTER_DESTROY_EVENT),
- FAILED(false, null),
- /**
- * @deprecated Unused. Will be removed in Tomcat 9.0.x. The state
transition
- * checking in {@link org.apache.catalina.util.LifecycleBase}
- * makes it impossible to use this state. The intended
behaviour
- * can be obtained by setting the state to
- * {@link LifecycleState#FAILED} in
- * <code>LifecycleBase.startInternal()</code>
- */
- @Deprecated
- MUST_STOP(true, null),
- /**
- * @deprecated Unused. Will be removed in Tomcat 9.0.x. The state
transition
- * checking in {@link org.apache.catalina.util.LifecycleBase}
- * makes it impossible to use this state. The intended
behaviour
- * can be obtained by implementing {@link Lifecycle.SingleUse}.
- */
- @Deprecated
- MUST_DESTROY(false, null);
+ FAILED(false, null);
private final boolean available;
private final String lifecycleEvent;
@@ -68,7 +50,6 @@ public enum LifecycleState {
* <li>{@link #STARTING}</li>
* <li>{@link #STARTED}</li>
* <li>{@link #STOPPING_PREP}</li>
- * <li>{@link #MUST_STOP}</li>
* </ul>
*
* @return <code>true</code> if the component is available for use,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
