Fix field injection and producer fields when instance is decorated/in…

…tercepted.
weld · Oct 29, 2009 · 1eef37f · 1eef37f
1 parent 0a42a48
commit 1eef37f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java b/impl/src/main/java/org/jboss/weld/bean/AbstractClassBean.java
@@ -43,6 +43,7 @@
 import org.jboss.interceptor.model.InterceptionModel;
 import org.jboss.interceptor.model.InterceptorClassMetadataImpl;
 import org.jboss.interceptor.util.InterceptionUtils;
+import org.jboss.interceptor.util.proxy.TargetInstanceProxy;
 import org.jboss.weld.BeanManagerImpl;
 import org.jboss.weld.DefinitionException;
 import org.jboss.weld.DeploymentException;
@@ -158,6 +159,7 @@ protected void initProxyClassForDecoratedBean()
       if (hasDecorators())
       {
          Set<Type> types = new LinkedHashSet<Type>(getTypes());
+         types.add(TargetInstanceProxy.class);
          ProxyFactory proxyFactory = Proxies.getProxyFactory(types);
 
          @SuppressWarnings("unchecked")

diff --git a/impl/src/main/java/org/jboss/weld/bean/ProducerField.java b/impl/src/main/java/org/jboss/weld/bean/ProducerField.java
@@ -25,6 +25,7 @@
 import javax.enterprise.inject.spi.InjectionPoint;
 import javax.enterprise.inject.spi.Producer;
 
+import org.jboss.interceptor.util.InterceptionUtils;
 import org.jboss.weld.BeanManagerImpl;
 import org.jboss.weld.bootstrap.BeanDeployerEnvironment;
 import org.jboss.weld.introspector.WeldField;
@@ -94,7 +95,8 @@ public Set<InjectionPoint> getInjectionPoints()
 
             public T produce(CreationalContext<T> creationalContext)
             {
-               return field.get(getReceiver(creationalContext));
+               // unwrap if we have a proxy
+               return field.get(InterceptionUtils.getRawInstance(getReceiver(creationalContext)));
             }
 
          });

diff --git a/impl/src/main/java/org/jboss/weld/bean/proxy/DecoratorProxyMethodHandler.java b/impl/src/main/java/org/jboss/weld/bean/proxy/DecoratorProxyMethodHandler.java
@@ -18,31 +18,27 @@
 
 import static org.jboss.weld.util.Reflections.ensureAccessible;
 
-import java.io.Serializable;
 import java.lang.reflect.Method;
 import java.util.List;
 
-import javassist.util.proxy.MethodHandler;
-
+import org.jboss.interceptor.util.proxy.TargetInstanceProxyMethodHandler;
 import org.jboss.weld.bean.DecoratorImpl;
-import org.jboss.weld.serialization.spi.helpers.SerializableContextualInstance;
 import org.jboss.weld.introspector.MethodSignature;
 import org.jboss.weld.introspector.WeldMethod;
 import org.jboss.weld.introspector.jlr.MethodSignatureImpl;
+import org.jboss.weld.serialization.spi.helpers.SerializableContextualInstance;
 
 /**
  * Method handler for decorated beans
  * 
  * @author Pete Muir
  * 
  */
-public class DecoratorProxyMethodHandler implements MethodHandler, Serializable
+public class DecoratorProxyMethodHandler extends TargetInstanceProxyMethodHandler
 {
    private static final long serialVersionUID = 4577632640130385060L;
 
    private final List<SerializableContextualInstance<DecoratorImpl<Object>, Object>> decoratorInstances;
-
-   private final Object instance;
 
    /**
     * Constructor
@@ -53,8 +49,8 @@ public class DecoratorProxyMethodHandler implements MethodHandler, Serializable
     */
    public DecoratorProxyMethodHandler(List<SerializableContextualInstance<DecoratorImpl<Object>, Object>> decoratorInstances, Object instance)
    {
+      super (instance, instance.getClass());
       this.decoratorInstances = decoratorInstances;
-      this.instance = instance;
    }
 
    /**
@@ -74,7 +70,7 @@ public DecoratorProxyMethodHandler(List<SerializableContextualInstance<Decorator
     * 
     * @throws Throwable if the method invocation fails.
     */
-   public Object invoke(Object self, Method method, Method proceed, Object[] args) throws Throwable
+   protected Object doInvoke(Object self, Method method, Method proceed, Object[] args) throws Throwable
    {
       MethodSignature methodSignature = new MethodSignatureImpl(method);
       for (SerializableContextualInstance<DecoratorImpl<Object>, Object> beanInstance : decoratorInstances)
@@ -86,7 +82,6 @@ public Object invoke(Object self, Method method, Method proceed, Object[] args)
          }
       }
 
-      return ensureAccessible(method).invoke(instance, args);
+      return ensureAccessible(method).invoke(getTargetInstance(), args);
    }
-
 }