[jboss-svn-commits] JBL Code SVN: r34288 - labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_CP2_1081443/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling.

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

Author: kevin.conner at jboss.com
Date: 2010-07-29 07:23:21 -0400 (Thu, 29 Jul 2010)
New Revision: 34288

Modified:
   labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_CP2_1081443/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPool.java
Log:
Merged 2031

Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_CP2_1081443/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPool.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_CP2_1081443/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPool.java	2010-07-29 09:15:02 UTC (rev 34287)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_CP2_1081443/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPool.java	2010-07-29 11:23:21 UTC (rev 34288)
@@ -105,7 +105,7 @@
     /**
      * The flag representing XA aware connections.
      */
-    private boolean isXAAware ;
+    private Boolean isXAAware ;
     /**
      * Flag signifying that the pool has been terminated.
      */
@@ -212,16 +212,16 @@
             addSessionPool();
         }
 
-        final Object factoryConnection ;
-        try
-        {
-            factoryConnection = getFactoryConnection() ;
+        if(isXAAware == null) {
+	        try
+	        {
+	            getFactoryConnection() ;
+	        }
+	        catch (final NamingContextException nce)
+	        {
+	            throw new ConnectionException("Unexpected exception accessing Naming Context", nce) ;
+	         }
         }
-        catch (final NamingContextException nce)
-        {
-            throw new ConnectionException("Unexpected exception accessing Naming Context", nce) ;
-        }
-        isXAAware = (factoryConnection instanceof XAConnectionFactory) ;
         
         final boolean transacted ;
         try {
@@ -318,6 +318,9 @@
         {
             NamingContextPool.releaseNamingContext(jndiContext) ;
         }
+
+        isXAAware = (factoryConnection instanceof XAConnectionFactory) ;
+
         return factoryConnection ;
     }