[jbossweb-commits] JBossWeb SVN: r1896 - in branches/JBOSSWEB_2_1_10_GA_JBPAPP-7745: java/org/apache/catalina/core and 1 other directories.
Author: bmaxwell
Date: 2011-12-15 11:45:53 -0500 (Thu, 15 Dec 2011)
New Revision: 1896
Modified:
branches/JBOSSWEB_2_1_10_GA_JBPAPP-7745/build.xml
branches/JBOSSWEB_2_1_10_GA_JBPAPP-7745/java/org/apache/catalina/core/StandardContext.java
branches/JBOSSWEB_2_1_10_GA_JBPAPP-7745/webapps/docs/changelog.xml
Log:
[JBPAPP-7745] fix org.apache.naming.resources.DirContextURLStreamHandler holds onto
ClassLoader after deployments have been undeployed
Modified: branches/JBOSSWEB_2_1_10_GA_JBPAPP-7745/build.xml
===================================================================
--- branches/JBOSSWEB_2_1_10_GA_JBPAPP-7745/build.xml 2011-12-15 15:22:11 UTC (rev 1895)
+++ branches/JBOSSWEB_2_1_10_GA_JBPAPP-7745/build.xml 2011-12-15 16:45:53 UTC (rev 1896)
@@ -17,7 +17,7 @@
<property name="version.major" value="2" />
<property name="version.minor" value="1" />
<property name="version.build" value="0" />
- <property name="version.patch" value="0" />
+ <property name="version.patch" value="JBPAPP-7745"
/>
<property name="version.tag" value="SNAPSHOT" />
<property name="version"
value="${version.major}.${version.minor}.${version.build}.${version.tag}" />
<property name="version.number"
value="${version.major}.${version.minor}.${version.build}.${version.patch}"
/>
Modified:
branches/JBOSSWEB_2_1_10_GA_JBPAPP-7745/java/org/apache/catalina/core/StandardContext.java
===================================================================
---
branches/JBOSSWEB_2_1_10_GA_JBPAPP-7745/java/org/apache/catalina/core/StandardContext.java 2011-12-15
15:22:11 UTC (rev 1895)
+++
branches/JBOSSWEB_2_1_10_GA_JBPAPP-7745/java/org/apache/catalina/core/StandardContext.java 2011-12-15
16:45:53 UTC (rev 1896)
@@ -4822,6 +4822,8 @@
*/
private void unbindThread(ClassLoader oldContextClassLoader) {
+ DirContextURLStreamHandler.unbind();
+
Thread.currentThread().setContextClassLoader(oldContextClassLoader);
oldContextClassLoader = null;
@@ -4830,8 +4832,6 @@
ContextBindings.unbindThread(this, this);
}
- DirContextURLStreamHandler.unbind();
-
}
Modified: branches/JBOSSWEB_2_1_10_GA_JBPAPP-7745/webapps/docs/changelog.xml
===================================================================
--- branches/JBOSSWEB_2_1_10_GA_JBPAPP-7745/webapps/docs/changelog.xml 2011-12-15 15:22:11
UTC (rev 1895)
+++ branches/JBOSSWEB_2_1_10_GA_JBPAPP-7745/webapps/docs/changelog.xml 2011-12-15 16:45:53
UTC (rev 1896)
@@ -71,6 +71,10 @@
<update>
Add new PING method for mod_cluster. (jfclere)
</update>
+ <fix>
+ <jboss-jira>AS7-1098</jboss-jira>: Call context classloader unbind
with the right
+ classloader. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">