[weld-commits] Weld SVN: r5511 - core/trunk/impl/src/main/java/org/jboss/weld/injection.

[weld-commits at lists.jboss.org]

Author: marius.bogoevici
Date: 2010-01-18 22:37:45 -0500 (Mon, 18 Jan 2010)
New Revision: 5511

Modified:
   core/trunk/impl/src/main/java/org/jboss/weld/injection/FieldInjectionPoint.java
Log:
WELD-356: inject(Object declaringInstance, Object value) wasn't fixed by WELD-225. Making the necessary adjustments.

Modified: core/trunk/impl/src/main/java/org/jboss/weld/injection/FieldInjectionPoint.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/injection/FieldInjectionPoint.java	2010-01-19 00:03:02 UTC (rev 5510)
+++ core/trunk/impl/src/main/java/org/jboss/weld/injection/FieldInjectionPoint.java	2010-01-19 03:37:45 UTC (rev 5511)
@@ -106,7 +106,13 @@
    {
       try
       {
-         delegate().set(declaringInstance, value);
+         Object instanceToInject = declaringInstance;
+         if (!isDelegate())
+         {
+            // if declaringInstance is a proxy, unwrap it
+            instanceToInject = InterceptionUtils.getRawInstance(declaringInstance);
+         }
+         delegate().set(instanceToInject, value);
       }
       catch (IllegalArgumentException e)
       {