remm 2002/12/10 04:47:05
Modified: catalina/src/share/org/apache/catalina/core
StandardWrapper.java
Log:
- Mark servlets as unavailable when the wrapper is stopped (bug 15077).
Revision Changes Path
1.44 +9 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java
Index: StandardWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- StandardWrapper.java 5 Dec 2002 09:12:37 -0000 1.43
+++ StandardWrapper.java 10 Dec 2002 12:47:05 -0000 1.44
@@ -852,7 +852,7 @@
if (jspWrapper != null)
actualClass = jspWrapper.getServletClass();
}
-
+
// Complain if no servlet class has been specified
if (actualClass == null) {
unavailable(null);
@@ -1333,6 +1333,8 @@
// Load and initialize an instance of this servlet if requested
// MOVED TO StandardContext START() METHOD
+ setAvailable(0L);
+
}
@@ -1343,6 +1345,8 @@
* @exception LifecycleException if a fatal error occurs during shutdown
*/
public void stop() throws LifecycleException {
+
+ setAvailable(Long.MAX_VALUE);
// Shut down our servlet instance (if it has been initialized)
try {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
