[jboss-cvs] JBossAS SVN: r85933 - branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/service.

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

Author: alesj
Date: 2009-03-16 11:34:21 -0400 (Mon, 16 Mar 2009)
New Revision: 85933

Modified:
   branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/service/TomcatInjectionContainer.java
Log:
Remove duplication.

Modified: branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/service/TomcatInjectionContainer.java
===================================================================
--- branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/service/TomcatInjectionContainer.java	2009-03-16 15:27:15 UTC (rev 85932)
+++ branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/service/TomcatInjectionContainer.java	2009-03-16 15:34:21 UTC (rev 85933)
@@ -253,16 +253,7 @@
          ClassNotFoundException
    {
       ClassLoader loader = catalinaContext.getLoader().getClassLoader();
-      Class<?> clazz = loader.loadClass(className);
-      checkAccess(clazz);
-      Object instance = clazz.newInstance();
-      processInjectors(instance);
-      if (!catalinaContext.getIgnoreAnnotations())
-      {
-         processDynamicBeanAnnotations(instance);
-         postConstruct(instance);
-      }
-      return instance;
+      return newInstance(className, loader);
    }
 
    public Object newInstance(String className, ClassLoader classLoader) throws IllegalAccessException, InvocationTargetException, NamingException,
@@ -271,12 +262,7 @@
       Class<?> clazz = classLoader.loadClass(className);
       checkAccess(clazz);
       Object instance = clazz.newInstance();
-      processInjectors(instance);
-      if (!catalinaContext.getIgnoreAnnotations())
-      {
-         processDynamicBeanAnnotations(instance);
-         postConstruct(instance);
-      }
+      newInstance(instance);
       return instance;
    }