[weld-commits] Weld SVN: r5759 - servlet/trunk/int/src/main/java/org/jboss/weld/environment/servlet.

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2010-02-05 08:43:05 -0500 (Fri, 05 Feb 2010)
New Revision: 5759

Modified:
   servlet/trunk/int/src/main/java/org/jboss/weld/environment/servlet/Listener.java
Log:
we need use the TCCL for Javassist on Jetty too

Modified: servlet/trunk/int/src/main/java/org/jboss/weld/environment/servlet/Listener.java
===================================================================
--- servlet/trunk/int/src/main/java/org/jboss/weld/environment/servlet/Listener.java	2010-02-05 09:43:11 UTC (rev 5758)
+++ servlet/trunk/int/src/main/java/org/jboss/weld/environment/servlet/Listener.java	2010-02-05 13:43:05 UTC (rev 5759)
@@ -93,6 +93,16 @@
    @Override
    public void contextInitialized(ServletContextEvent sce)
    {
+      // Make Javassist always use the TCCL to load classes
+      ProxyFactory.classLoaderProvider = new ClassLoaderProvider()
+      {
+         
+         public ClassLoader get(ProxyFactory pf)
+         {
+            return Thread.currentThread().getContextClassLoader();
+         }
+         
+      };
       BeanStore applicationBeanStore = new ConcurrentHashMapBeanStore();
       sce.getServletContext().setAttribute(APPLICATION_BEAN_STORE_ATTRIBUTE_NAME, applicationBeanStore);
       
@@ -127,16 +137,6 @@
       
       if (tomcat)
       {
-         // Make Javassist always use the TCCL to load classes
-         ProxyFactory.classLoaderProvider = new ClassLoaderProvider()
-         {
-            
-            public ClassLoader get(ProxyFactory pf)
-            {
-               return Thread.currentThread().getContextClassLoader();
-            }
-            
-         };
          // Try pushing a Tomcat AnnotationProcessor into the servlet context
          try
          {