[jboss-cvs] JBossAS SVN: r77344 - trunk/tomcat/src/main/org/jboss/web/tomcat/service/injection.

[jboss-cvs-commits at lists.jboss.org]

Author: emuckenhuber
Date: 2008-08-22 04:03:23 -0400 (Fri, 22 Aug 2008)
New Revision: 77344

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/injection/TomcatInjectionUtils.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/injection/WebServiceRefInjectionHandler.java
Log:
[JBAS-5673] minor cleanup

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/injection/TomcatInjectionUtils.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/injection/TomcatInjectionUtils.java	2008-08-22 07:41:34 UTC (rev 77343)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/injection/TomcatInjectionUtils.java	2008-08-22 08:03:23 UTC (rev 77344)
@@ -34,10 +34,8 @@
 import org.jboss.injection.InjectorFactory;
 import org.jboss.injection.lang.reflect.BeanProperty;
 import org.jboss.injection.lang.reflect.BeanPropertyFactory;
-import org.jboss.logging.Logger;
 import org.jboss.metadata.javaee.spec.RemoteEnvironment;
 import org.jboss.metadata.javaee.spec.ResourceInjectionTargetMetaData;
-import org.jboss.web.tomcat.service.TomcatInjectionContainer;
 
 /**
  * TomcatInjectionContainer injection utils.

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/injection/WebServiceRefInjectionHandler.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/injection/WebServiceRefInjectionHandler.java	2008-08-22 07:41:34 UTC (rev 77343)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/injection/WebServiceRefInjectionHandler.java	2008-08-22 08:03:23 UTC (rev 77344)
@@ -86,7 +86,7 @@
          else
          {
             if(container.getEncInjections().containsKey(encName))
-               return;
+               continue;
             
             // Class annotations don't create a injectionTarget
             if(sref.getAnnotatedElement() != null)
@@ -97,17 +97,17 @@
    
    private void addInjector(InjectionContainer container, String encName, AnnotatedElement annotatedElement)
    {
-      Injector jndiInjector;
+      Injector jndiInjector = null;
       if(annotatedElement instanceof Method)
       {
-         Method method = (Method)annotatedElement; 
-         jndiInjector = new JndiMethodInjector((Method)annotatedElement, encName, container.getEnc());
+         Method method = (Method) annotatedElement; 
+         jndiInjector = new JndiMethodInjector(method, encName, container.getEnc());
          addInjector(container, method, method.getDeclaringClass(), jndiInjector);
       }
       else if(annotatedElement instanceof Field)
       {
          Field field = (Field) annotatedElement;
-         jndiInjector = new JndiFieldInjector((Field)annotatedElement, encName, container.getEnc());
+         jndiInjector = new JndiFieldInjector(field, encName, container.getEnc());
          addInjector(container, field, field.getDeclaringClass(), jndiInjector);
       }
       else
@@ -116,6 +116,9 @@
    
    private void addInjector(InjectionContainer container, AccessibleObject ao, Class<?> declaringClass, Injector injector)
    {
+      if(injector == null)
+         throw new IllegalArgumentException("null injector.");
+      
       Map<AccessibleObject, Injector> map = container.getEncInjections().get(declaringClass.getName());
       if(map == null)
       {