remm 2005/03/25 08:47:44
Modified: catalina/src/share/org/apache/catalina/core
StandardContext.java
webapps/docs changelog.xml
Log:
- 34161: StdContext.stop should do the same thing as ContainerBase.stop (ie,
not throw an exception if it was not started).
Revision Changes Path
1.172 +6 -7
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java
Index: StandardContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- StandardContext.java 25 Mar 2005 03:56:55 -0000 1.171
+++ StandardContext.java 25 Mar 2005 16:47:44 -0000 1.172
@@ -4221,12 +4221,11 @@
public synchronized void stop() throws LifecycleException {
// Validate and update our current component state
- if (!started)
- throw new LifecycleException
- (sm.getString("containerBase.notStarted", logName()));
-
- if (log.isDebugEnabled())
- log.debug("Stopping");
+ if (!started) {
+ if(log.isInfoEnabled())
+ log.info(sm.getString("containerBase.notStarted",
logName()));
+ return;
+ }
// Notify our interested LifecycleListeners
lifecycle.fireLifecycleEvent(BEFORE_STOP_EVENT, null);
1.270 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -r1.269 -r1.270
--- changelog.xml 25 Mar 2005 16:43:09 -0000 1.269
+++ changelog.xml 25 Mar 2005 16:47:44 -0000 1.270
@@ -134,6 +134,9 @@
<update>
Fix some RealmBase/JNDIRealm log.isXXXEnabled (pero)
</update>
+ <fix>
+ <bug>34161</bug>: Harmonize StandardContext.stop with
ContainerBase.stop (remm)
+ </fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
