[jboss-cvs] JBossAS SVN: r103482 - projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3.

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

Author: jaikiran
Date: 2010-04-02 11:56:13 -0400 (Fri, 02 Apr 2010)
New Revision: 103482

Modified:
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java
Log:
EJBTHREE-2010 Allowed processMetaData to function without a Ejb3Deployment (to accomodate singleton container)

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java	2010-04-02 15:35:34 UTC (rev 103481)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java	2010-04-02 15:56:13 UTC (rev 103482)
@@ -608,7 +608,7 @@
       // XML must be done first so that any annotation overrides are initialized
       
       // todo injection handlers should be pluggable from XML
-      Collection<InjectionHandler<Environment>> handlers = this.deployment.getHandlers();
+      Collection<InjectionHandler<Environment>> handlers = this.getInjectionHandlers();
       if(handlers == null)
       {
          handlers = new ArrayList<InjectionHandler<Environment>>();
@@ -701,6 +701,14 @@
       }
    }
    
+   protected Collection<InjectionHandler<Environment>> getInjectionHandlers()
+   {
+      if (this.deployment != null)
+      {
+         return this.deployment.getHandlers();
+      }
+      return null;
+   }
    /**
     * Ensures that the bean does not implement any one interface as both @Local and @Remote
     *