clean up ctor

impl/src/main/java/org/jboss/weld/bean/proxy/ProxyFactory.java

@@ -60,9 +60,9 @@ public class ProxyFactory<T>
 
    protected final Class<?>            beanType;
    protected final ArrayList<Class<?>> additionalInterfaces = new ArrayList<Class<?>>();
-   protected ClassLoader               classLoader;
-   protected ProtectionDomain          protectionDomain;
-   protected ClassPool                 classPool;
+   protected final ClassLoader               classLoader;
+   protected final ProtectionDomain          protectionDomain;
+   protected final ClassPool                 classPool;
 
    /**
     * Creates a new proxy factory from any type of BeanInstance. This bean
@@ -73,35 +73,29 @@ public class ProxyFactory<T>
     */
    public ProxyFactory(BeanInstance beanInstance)
    {
-      this.beanType = beanInstance.getInstanceType();
-      init();
+      this(beanInstance.getInstanceType());
    }
 
    /**
     * Creates a new proxy factory with only the type of proxy specified.
     * 
     * @param proxiedBeanType the super-class for this proxy class
     */
-   public ProxyFactory(Class<T> proxiedBeanType)
+   public ProxyFactory(Class<?> proxiedBeanType)
    {
       this.beanType = proxiedBeanType;
-      init();
-   }
-
-   /**
-    * Initializes the proxy factory.
-    */
-   private void init()
-   {
-      classLoader = beanType.getClassLoader();
-      protectionDomain = beanType.getProtectionDomain();
       if (beanType.getName().startsWith("java."))
       {
-         classLoader = this.getClass().getClassLoader();
-         protectionDomain = this.getClass().getProtectionDomain();
+         this.classLoader = this.getClass().getClassLoader();
+         this.protectionDomain = this.getClass().getProtectionDomain();
+      }
+      else
+      {
+         this.classLoader = beanType.getClassLoader();
+         this.protectionDomain = beanType.getProtectionDomain();
       }
-      classPool = new ClassPool();
-      classPool.appendClassPath(new ClassloaderClassPath(classLoader));
+      this.classPool = new ClassPool();
+      this.classPool.appendClassPath(new ClassloaderClassPath(classLoader));
       addDefaultAdditionalInterfaces();
    }