[weld-commits] Weld SVN: r6266 - core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/util.

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2010-05-20 16:11:45 -0400 (Thu, 20 May 2010)
New Revision: 6266

Modified:
   core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/util/SimpleProxyServices.java
Log:
revert simple proxy services to be symmetric

Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/util/SimpleProxyServices.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/util/SimpleProxyServices.java	2010-05-20 20:11:12 UTC (rev 6265)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/util/SimpleProxyServices.java	2010-05-20 20:11:45 UTC (rev 6266)
@@ -38,28 +38,38 @@
 public class SimpleProxyServices implements ProxyServices
 {
 
-   public ClassLoader getClassLoader(Class<?> type)
+   public ClassLoader getClassLoader(final Class<?> type)
    {
       SecurityManager sm = System.getSecurityManager();
-      if (sm != null) {
-          return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
-              public ClassLoader run() {
-                  return Thread.currentThread().getContextClassLoader();
-              }
-          });
-      } else {
-          return Thread.currentThread().getContextClassLoader();
+      if (sm != null)
+      {
+         return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>()
+         {
+            public ClassLoader run()
+            {
+               return _getClassLoader(type);
+            }
+         });
       }
-//      if (type.getName().startsWith("java"))
-//      {
-//         return this.getClass().getClassLoader();
-//      }
-//      else
-//      {
-//         return type.getClassLoader();
-//      }
+      else
+      {
+         return _getClassLoader(type);
+      }      
    }
 
+   private ClassLoader _getClassLoader(Class<?> type)
+   {
+      // return Thread.currentThread().getContextClassLoader();
+      if (type.getName().startsWith("java"))
+      {
+         return this.getClass().getClassLoader();
+      }
+      else
+      {
+         return type.getClassLoader();
+      }
+   }
+
    public ProtectionDomain getProtectionDomain(Class<?> type)
    {
       if (type.getName().startsWith("java"))
@@ -92,7 +102,8 @@
          {
             public Object run() throws Exception
             {
-               //ClassLoader cl = Thread.currentThread().getContextClassLoader();
+               // ClassLoader cl =
+               // Thread.currentThread().getContextClassLoader();
                ClassLoader cl = getClassLoader(this.getClass());
                return Class.forName(className, true, cl);
             }