Author: markt
Date: Mon Sep 19 13:19:27 2011
New Revision: 1172610
URL: http://svn.apache.org/viewvc?rev=1172610&view=rev
Log:
JSP unloading code was retaining a reference to the unloaded JSP preventing the
associated class from being unloaded until the JSP that replaced it was
unloaded.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
tomcat/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java?rev=1172610&r1=1172609&r2=1172610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java Mon Sep
19 13:19:27 2011
@@ -250,6 +250,7 @@ public final class JspRuntimeContext {
replaced.getJspUri(),
context.getContextPath()));
}
unloadJspServletWrapper(replaced);
+ entry.clearReplaced();
}
return entry;
}
Modified: tomcat/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java?rev=1172610&r1=1172609&r2=1172610&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java (original)
+++ tomcat/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java Mon Sep 19
13:19:27 2011
@@ -284,6 +284,10 @@ public class FastRemovalDequeue<T> {
this.replaced = replaced;
}
+ public final void clearReplaced() {
+ this.replaced = null;
+ }
+
private final Entry getNext() {
return next;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
