remm 02/02/19 17:26:26
Modified: catalina/src/share/org/apache/catalina/core Tag:
tomcat_40_branch StandardContext.java
Log:
- Port fix for bug 6550 (memory leak when reloading).
- This version of the fix is a lot more hackish, beacause TC 4.0 doesn't have
the refactoring of the naming context handling as a listener :-(
Revision Changes Path
No revision
No revision
1.78.2.12 +9 -4
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.78.2.11
retrieving revision 1.78.2.12
diff -u -r1.78.2.11 -r1.78.2.12
--- StandardContext.java 14 Feb 2002 19:54:00 -0000 1.78.2.11
+++ StandardContext.java 20 Feb 2002 01:26:26 -0000 1.78.2.12
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
1.78.2.11 2002/02/14 19:54:00 remm Exp $
- * $Revision: 1.78.2.11 $
- * $Date: 2002/02/14 19:54:00 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
1.78.2.12 2002/02/20 01:26:26 remm Exp $
+ * $Revision: 1.78.2.12 $
+ * $Date: 2002/02/20 01:26:26 $
*
* ====================================================================
*
@@ -142,7 +142,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.78.2.11 $ $Date: 2002/02/14 19:54:00 $
+ * @version $Revision: 1.78.2.12 $ $Date: 2002/02/20 01:26:26 $
*/
public class StandardContext
@@ -2418,6 +2418,10 @@
}
}
+ if (isUseNaming()) {
+ ContextBindings.unbindClassLoader(this, this);
+ }
+
// Restart our application class loader
if ((loader != null) && (loader instanceof Lifecycle)) {
try {
@@ -3444,6 +3448,7 @@
// Create and register the associated naming context, if internal
// naming is used
if (isUseNaming()) {
+ ContextBindings.unbindClassLoader(this, this);
ContextAccessController.unsetSecurityToken
(getNamingContextName(), this);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
