[jbossws-commits] JBossWS SVN: r9715 - common/trunk/src/main/java/org/jboss/wsf/common/javax.

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2009-04-03 07:33:48 -0400 (Fri, 03 Apr 2009)
New Revision: 9715

Modified:
   common/trunk/src/main/java/org/jboss/wsf/common/javax/JavaxAnnotationHelper.java
Log:
[JBWS-2074] injections metadata can be null

Modified: common/trunk/src/main/java/org/jboss/wsf/common/javax/JavaxAnnotationHelper.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/javax/JavaxAnnotationHelper.java	2009-04-03 11:24:18 UTC (rev 9714)
+++ common/trunk/src/main/java/org/jboss/wsf/common/javax/JavaxAnnotationHelper.java	2009-04-03 11:33:48 UTC (rev 9715)
@@ -77,34 +77,35 @@
    {
       if (instance == null)
          throw new IllegalArgumentException("Object instance cannot be null");
-      if (injections == null)
-         throw new IllegalArgumentException("Injections metadata cannot be null");
       
       Class<?> instanceClass = instance.getClass();
       
       InitialContext ctx = new InitialContext();
 
       // inject descriptor driven annotations
-      Collection<InjectionMetaData> injectionMDs = injections.getInjectionsMetaData(instanceClass);
-      for (InjectionMetaData injectionMD : injectionMDs)
+      if (injections != null)
       {
-         Method method = getMethod(injectionMD, instanceClass);
-         if (method != null)
+         Collection<InjectionMetaData> injectionMDs = injections.getInjectionsMetaData(instanceClass);
+         for (InjectionMetaData injectionMD : injectionMDs)
          {
-            // inject descriptor driven annotated method
-            inject(instance, method, injectionMD.getEnvEntryName(), ctx);
-         }
-         else
-         {
-            Field field = getField(injectionMD, instanceClass);
-            if (field != null)
+            Method method = getMethod(injectionMD, instanceClass);
+            if (method != null)
             {
-               // inject descriptor driven annotated field
-               inject(instance, field, injectionMD.getEnvEntryName(), ctx);
+               // inject descriptor driven annotated method
+               inject(instance, method, injectionMD.getEnvEntryName(), ctx);
             }
             else
             {
-               throw new RuntimeException("Cannot find injection target for: " + injectionMD);
+               Field field = getField(injectionMD, instanceClass);
+               if (field != null)
+               {
+                  // inject descriptor driven annotated field
+                  inject(instance, field, injectionMD.getEnvEntryName(), ctx);
+               }
+               else
+               {
+                  throw new RuntimeException("Cannot find injection target for: " + injectionMD);
+               }
             }
          }
       }