You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2003/04/29 22:36:34 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core StandardContext.java StandardWrapper.java
remm 2003/04/29 13:36:34
Modified: catalina/src/share/org/apache/catalina/core
StandardContext.java StandardWrapper.java
Log:
- Port two bugfixes.
- STM NPE after reload.
- Fix listener shutdown order (fixes JNDI access).
Revision Changes Path
1.119 +7 -7 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java
Index: StandardContext.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- StandardContext.java 2 Apr 2003 19:43:20 -0000 1.118
+++ StandardContext.java 29 Apr 2003 20:36:33 -0000 1.119
@@ -3659,6 +3659,9 @@
// Stop our filters
filterStop();
+ // Stop our application listeners
+ listenerStop();
+
// Finalize our character set mapper
setCharsetMapper(null);
@@ -3693,9 +3696,6 @@
if (mappers[(mappers.length-1)-i] instanceof Lifecycle)
((Lifecycle) mappers[(mappers.length-1)-i]).stop();
}
-
- // Stop our application listeners
- listenerStop();
// Stop resources
resourcesStop();
1.46 +6 -4 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.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- StandardWrapper.java 6 Feb 2003 22:06:33 -0000 1.45
+++ StandardWrapper.java 29 Apr 2003 20:36:33 -0000 1.46
@@ -1177,6 +1177,8 @@
nInstances = 0;
}
+ singleThreadModel = false;
+
unloading = false;
fireContainerEvent("unload", this);
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org