Author: remy.maucherat(a)jboss.com Date: 2011-06-23 18:12:31 -0400 (Thu, 23 Jun 2011) New Revision: 1743 Modified: trunk/java/org/apache/catalina/core/StandardContext.java trunk/webapps/docs/changelog.xml Log: - AS7-1098: Fix classloader unbind. Submitted by Stuart Douglas. Modified: trunk/java/org/apache/catalina/core/StandardContext.java =================================================================== --- trunk/java/org/apache/catalina/core/StandardContext.java 2011-06-22 09:59:29 UTC (rev 1742) +++ trunk/java/org/apache/catalina/core/StandardContext.java 2011-06-23 22:12:31 UTC (rev 1743) @@ -4212,14 +4212,14 @@ */ protected void unbindThread(ClassLoader oldContextClassLoader) { + DirContextURLStreamHandler.unbind(); + lifecycle.fireLifecycleEvent(UNBIND_THREAD_EVENT, null); Thread.currentThread().setContextClassLoader(oldContextClassLoader); oldContextClassLoader = null; - DirContextURLStreamHandler.unbind(); - } Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2011-06-22 09:59:29 UTC (rev 1742) +++ trunk/webapps/docs/changelog.xml 2011-06-23 22:12:31 UTC (rev 1743) @@ -29,6 +29,10 @@ Allow valves to replace the IS/reader and OS/writer that gets returned to the applications. (remm) </update> + <fix> + <jboss-jira>AS7-1098</jboss-jira>: Call context classloader unbind with the right + classloader. (remm) + </fix> </changelog> </subsection> <subsection name="Jasper">