[weld-commits] Weld SVN: r6458 - core/branches/1.0.1-SP2/impl/src/main/java/org/jboss/weld/bean.

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2010-06-16 15:15:22 -0400 (Wed, 16 Jun 2010)
New Revision: 6458

Modified:
   core/branches/1.0.1-SP2/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java
   core/branches/1.0.1-SP2/impl/src/main/java/org/jboss/weld/bean/SessionBean.java
Log:
WELD-556

Modified: core/branches/1.0.1-SP2/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java
===================================================================
--- core/branches/1.0.1-SP2/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java	2010-06-16 18:58:16 UTC (rev 6457)
+++ core/branches/1.0.1-SP2/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java	2010-06-16 19:15:22 UTC (rev 6458)
@@ -135,7 +135,7 @@
 
    // Decorators
    private List<Decorator<?>> decorators;
-   private Class<T> proxyClassForDecorators;
+   protected Class<T> proxyClassForDecorators;
 
    // Interceptors
    private boolean hasSerializationOrInvocationInterceptorMethods;

Modified: core/branches/1.0.1-SP2/impl/src/main/java/org/jboss/weld/bean/SessionBean.java
===================================================================
--- core/branches/1.0.1-SP2/impl/src/main/java/org/jboss/weld/bean/SessionBean.java	2010-06-16 18:58:16 UTC (rev 6457)
+++ core/branches/1.0.1-SP2/impl/src/main/java/org/jboss/weld/bean/SessionBean.java	2010-06-16 19:15:22 UTC (rev 6458)
@@ -52,6 +52,7 @@
 import javax.interceptor.Interceptor;
 
 import org.jboss.interceptor.model.InterceptionModel;
+import org.jboss.interceptor.util.proxy.TargetInstanceProxy;
 import org.jboss.weld.bean.interceptor.InterceptorBindingsAdapter;
 import org.jboss.weld.bean.proxy.EnterpriseBeanInstance;
 import org.jboss.weld.bean.proxy.EnterpriseBeanProxyMethodHandler;
@@ -220,6 +221,12 @@
    {
       this.proxyClass = Proxies.createProxyClass(TypeInfo.of(getTypes()).add(EnterpriseBeanInstance.class).add(Serializable.class));
    }
+   
+   @Override
+   protected void initProxyClassForDecoratedBean()
+   {
+      super.proxyClassForDecorators = Proxies.createProxyClass(TypeInfo.of(getTypes()).add(TargetInstanceProxy.class).add(EnterpriseBeanInstance.class).add(Serializable.class));
+   }
 
    /**
     * Validates for non-conflicting roles