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

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

Author: jaikiran
Date: 2010-04-08 06:09:37 -0400 (Thu, 08 Apr 2010)
New Revision: 103689

Modified:
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/DefaultEjbEncFactory.java
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java
Log:
EJBTHREE-2074 EjbEncFactory implementations are now responsible for closing the ENC context, in their cleanupENC method

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/DefaultEjbEncFactory.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/DefaultEjbEncFactory.java	2010-04-08 09:42:44 UTC (rev 103688)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/DefaultEjbEncFactory.java	2010-04-08 10:09:37 UTC (rev 103689)
@@ -67,6 +67,21 @@
 
    public void cleanupEnc(EJBContainer container)
    {
+      if (container == null)
+      {
+         return;
+      }
+      // close the ENC context
+      try
+      {
+         InitialContextFactory.close(container.getEnc(), container.getInitialContextProperties());
+      }
+      catch (NamingException ne)
+      {
+         throw new RuntimeException("Could not close ENC context for container " + container.getObjectName(), ne);
+      }
+      // remove references from the factory
       ENCFactory.getEncById().remove(container.getObjectName());
+
    }
 }

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-08 09:42:44 UTC (rev 103688)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/EJBContainer.java	2010-04-08 10:09:37 UTC (rev 103689)
@@ -1069,11 +1069,8 @@
       injectors = new ArrayList<Injector>();
       encInjectors = new HashMap<String, EncInjector>();
       
-      InitialContextFactory.close(enc, this.initialContextProperties);
-      enc = null; 
-      
       encFactory.cleanupEnc(this);
-      
+      enc = null;
       // TODO: clean up BeanContainer?
       //super.cleanup();