[jboss-cvs] JBossAS SVN: r69055 - branches/JBPAPP_4_2_0_GA_CP/ejb3/src/main/org/jboss/ejb3/mdb.

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

Author: bdecoste
Date: 2008-01-16 18:49:33 -0500 (Wed, 16 Jan 2008)
New Revision: 69055

Modified:
   branches/JBPAPP_4_2_0_GA_CP/ejb3/src/main/org/jboss/ejb3/mdb/MessagingContainer.java
Log:
[JBPAPP-550] merged changes from Branch_4_2

Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/main/org/jboss/ejb3/mdb/MessagingContainer.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/main/org/jboss/ejb3/mdb/MessagingContainer.java	2008-01-16 22:58:40 UTC (rev 69054)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/main/org/jboss/ejb3/mdb/MessagingContainer.java	2008-01-16 23:49:33 UTC (rev 69055)
@@ -559,12 +559,20 @@
    protected JMSProviderAdapter getJMSProviderAdapter()
            throws NamingException
    {
+      Context context = getInitialContext();
       //todo make this pluggable
       String providerAdapterJNDI = getProviderAdapterJNDI();
-      
-      log.debug("Looking up provider adapter: " + providerAdapterJNDI);
+      try
+      {
+         log.debug("Looking up provider adapter: " + providerAdapterJNDI);
      
-      return (JMSProviderAdapter) getInitialContext().lookup(providerAdapterJNDI);
+         return (JMSProviderAdapter) context.lookup(providerAdapterJNDI);
+      }
+      finally
+      {
+         context.close();
+      }
+
    }
 
    /**