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

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

Author: emuckenhuber
Date: 2008-10-15 08:50:59 -0400 (Wed, 15 Oct 2008)
New Revision: 79524

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/TomcatInjectionContainer.java
Log:
[JBAS-6099] make process annotations reusable

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/TomcatInjectionContainer.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/TomcatInjectionContainer.java	2008-10-15 12:45:36 UTC (rev 79523)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/TomcatInjectionContainer.java	2008-10-15 12:50:59 UTC (rev 79524)
@@ -244,7 +244,7 @@
       processInjectors(instance);
 	  if (!catalinaContext.getIgnoreAnnotations())
 	  {
-		   processAnnotations(instance);
+	       processDynamicBeanAnnotations(instance);
 		   postConstruct(instance);
 	  }
       return instance;
@@ -258,7 +258,7 @@
        processInjectors(instance);
 	   if (!catalinaContext.getIgnoreAnnotations())
 	   {
-		   processAnnotations(instance);
+	       processDynamicBeanAnnotations(instance);
 		   postConstruct(instance);
 	   }
        return instance;
@@ -269,7 +269,7 @@
       processInjectors(instance);
 	  if (!catalinaContext.getIgnoreAnnotations())
 	  {
-		   processAnnotations(instance);
+	       processDynamicBeanAnnotations(instance);
 		   postConstruct(instance);
 	  }
    }
@@ -363,6 +363,22 @@
    }
    
    /**
+    * Process annotations for dynamic beans only.
+    * 
+    * @param object the object
+    * @throws IllegalAccessException
+    * @throws InvocationTargetException
+    * @throws NamingException
+    */
+   protected void processDynamicBeanAnnotations(Object object)
+               throws IllegalAccessException, InvocationTargetException, NamingException
+   {
+      // Only process annotation on dynamic beans
+      if(isDynamicBean(object))
+         processAnnotations(object);
+   }
+   
+   /**
     * When we get here, we are assuming that any XML defined injection has been already done.
     * We will set up more here if the class being processed is a dynamic class.
     *
@@ -375,9 +391,6 @@
           throws IllegalAccessException, InvocationTargetException, NamingException
    {
       final boolean trace = log.isTraceEnabled();
-      // Only process annotation on dynamic beans
-      if(! isDynamicBean(object))
-         return;
       
       Map<AccessibleObject, Injector> injectors = getEncInjectionsForClass(object.getClass(), true);
       if (injectors == null)