You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by ge...@apache.org on 2009/03/11 23:19:39 UTC

svn commit: r752654 - in /incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject: AbstractInjectable.java InjectableMethods.java

Author: gerdogdu
Date: Wed Mar 11 22:19:39 2009
New Revision: 752654

URL: http://svn.apache.org/viewvc?rev=752654&view=rev
Log:
Updating resource injection.

Modified:
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethods.java

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java?rev=752654&r1=752653&r2=752654&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java Wed Mar 11 22:19:39 2009
@@ -90,10 +90,10 @@
         
         try
         {
-            if (isResource(annotations))
+            if (isResource(this.injectionAnnotations))
             {
                 //X TODO do we need the args too?
-                return injectResource(type, annotations);
+                return injectResource(type, this.injectionAnnotations);
             }
             
             if (isNewBinding(annotations))

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethods.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethods.java?rev=752654&r1=752653&r2=752654&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethods.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethods.java Wed Mar 11 22:19:39 2009
@@ -65,6 +65,9 @@
         List<Object> list = new ArrayList<Object>();
         
         Annotation[] methodAnnots = m.getAnnotations();
+        
+        this.injectionAnnotations = methodAnnots;
+        
         if (isResource(methodAnnots))
         {
             // if the method itself is resource annotated, e.g. @PersistenceUnit