[jboss-cvs] JBossAS SVN: r58439 - trunk/tomcat/src/main/org/jboss/web/tomcat/tc6

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

Author: scott.stark at jboss.org
Date: 2006-11-16 01:14:01 -0500 (Thu, 16 Nov 2006)
New Revision: 58439

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/TomcatInjectionContainer.java
Log:
Set the tcl to the web loader before setting up the enc

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/TomcatInjectionContainer.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/TomcatInjectionContainer.java	2006-11-16 06:13:04 UTC (rev 58438)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/TomcatInjectionContainer.java	2006-11-16 06:14:01 UTC (rev 58439)
@@ -201,10 +201,19 @@
 
    public void populateEnc(ClassLoader loader)
    {
-      for (EncInjector injector : encInjectors.values())
+      ClassLoader old = Thread.currentThread().getContextClassLoader();
+      try
       {
-         injector.inject(this);
+         Thread.currentThread().setContextClassLoader(loader);
+         for (EncInjector injector : encInjectors.values())
+         {
+            injector.inject(this);
+         }
       }
+      finally
+      {
+         Thread.currentThread().setContextClassLoader(old);
+      }
    }
 
    private InputStream[] getInputStreams()