[jboss-cvs] JBossAS SVN: r97331 - branches/JBPAPP_5_0/tomcat/src/main/org/jboss/web/tomcat/service/deployers.

[jboss-cvs-commits at lists.jboss.org]

Author: scott.stark at jboss.org
Date: 2009-12-02 17:33:39 -0500 (Wed, 02 Dec 2009)
New Revision: 97331

Modified:
   branches/JBPAPP_5_0/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
Log:
JBPAPP-2742, set/unset tccl in JBossContextConfig.processContextConfig to the JBossContextConfig class loader


Modified: branches/JBPAPP_5_0/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
===================================================================
--- branches/JBPAPP_5_0/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2009-12-02 22:24:35 UTC (rev 97330)
+++ branches/JBPAPP_5_0/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2009-12-02 22:33:39 UTC (rev 97331)
@@ -542,6 +542,9 @@
 
    protected void processContextConfig(String resourceName, boolean local)
    {
+      ClassLoader oldCl = Thread.currentThread().getContextClassLoader();
+      Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
+
       ContextMetaData contextMetaData = null;
       try
       {
@@ -593,6 +596,10 @@
          ok = false;
          return;
       }
+      finally
+      {
+         Thread.currentThread().setContextClassLoader(oldCl);
+      }
 
       if (contextMetaData != null)
       {
@@ -694,3 +701,4 @@
    }
 
 }
+