Author: markt
Date: Mon May 10 15:41:58 2010
New Revision: 942794
URL: http://svn.apache.org/viewvc?rev=942794&view=rev
Log:
Allow the transition from NEW to DESTROYED for objects that are never started.
Modified:
tomcat/trunk/java/org/apache/catalina/Lifecycle.java
tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java
Modified: tomcat/trunk/java/org/apache/catalina/Lifecycle.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Lifecycle.java?rev=942794&r1=942793&r2=942794&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Lifecycle.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Lifecycle.java Mon May 10 15:41:58
2010
@@ -31,25 +31,29 @@ package org.apache.catalina;
* |
|
* init() start() | auto auto stop()
|
* NEW ->-- INITIALIZED -->-- STARTING_PREP -->- STARTING -->- STARTED -->---
|
- * | | ^ | |
|
- * | | start() | | |
|
- * | ----------->-------------------- | |
|
- * | | |
|
- * | auto auto | |
|
- * |stop() ---------<----- MUST_STOP ---------------------<-- |
|
- * | | |
|
- * | ---------------------------<--------------------------------
^
- * | |
|
- * | | auto auto start()
|
- * | STOPPING_PREP ------>----- STOPPING ------>----- STOPPED
---->------
- * | ^ | | ^
- * | | auto | | |
- * | |stop() MUST_DESTROY------<------- | |
- * | | | | |
- * | | |auto | |
- * | | destroy() \|/ destroy() | |
- * | FAILED ---->------ DESTROYED ----<----------------- |
+ * ||| ^ | |
|
+ * ||| start() | | |
|
+ * ||----------->-------------------- | |
|
+ * || | |
|
+ * |--- auto auto | |
|
+ * | | ---------<----- MUST_STOP ---------------------<-- |
|
+ * | | | |
|
+ * | | ---------------------------<--------------------------------
^
+ * | | |
|
+ * | | | auto auto start()
|
+ * | | STOPPING_PREP ------>----- STOPPING ------>----- STOPPED
---->------
+ * | | ^ | | ^
+ * | | | auto | | |
+ * | | |stop() MUST_DESTROY------<------- | |
+ * | | | | | |
+ * | | | |auto | |
+ * | | | destroy() \|/ destroy() | |
+ * | | FAILED ---->------ DESTROYED ----<----------------- |
+ * | | ^ |
+ * | | destroy() | |
+ * | ------------------------------- |
* | |
+ * | stop() |
* --->------------------------------>------------------------------
*
* Any state can transition to FAILED.
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=942794&r1=942793&r2=942794&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java Mon May 10
15:41:58 2010
@@ -255,7 +255,8 @@ public abstract class LifecycleBase impl
}
if (!state.equals(LifecycleState.STOPPED) &&
- !state.equals(LifecycleState.FAILED)) {
+ !state.equals(LifecycleState.FAILED) &&
+ !state.equals(LifecycleState.NEW)) {
invalidTransition(Lifecycle.DESTROY_EVENT);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
