[jboss-svn-commits] JBL Code SVN: r32451 - labs/jbossesb/branches/JBESB_4_7_CP/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-04-06 10:52:03 -0400 (Tue, 06 Apr 2010)
New Revision: 32451

Modified:
   labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPool.java
Log:
Rolled back revision 32449 until committed in SOA; JBESB-3265

Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPool.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPool.java	2010-04-06 14:48:52 UTC (rev 32450)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/JmsConnectionPool.java	2010-04-06 14:52:03 UTC (rev 32451)
@@ -109,7 +109,7 @@
     /**
      * The flag representing XA aware connections.
      */
-    private Boolean isXAAware ;
+    private boolean isXAAware ;
     /**
      * Flag signifying that the pool has been terminated.
      */
@@ -216,16 +216,16 @@
             addSessionPool();
         }
 
-        if(isXAAware == null) {
-	        try
-	        {
-	            getFactoryConnection() ;
-	        }
-	        catch (final NamingContextException nce)
-	        {
-	            throw new ConnectionException("Unexpected exception accessing Naming Context", nce) ;
-	         }
+        final Object factoryConnection ;
+        try
+        {
+            factoryConnection = getFactoryConnection() ;
         }
+        catch (final NamingContextException nce)
+        {
+            throw new ConnectionException("Unexpected exception accessing Naming Context", nce) ;
+        }
+        isXAAware = (factoryConnection instanceof XAConnectionFactory) ;
         
         final boolean transacted ;
         try {
@@ -322,9 +322,6 @@
         {
             NamingContextPool.releaseNamingContext(jndiContext) ;
         }
-
-        isXAAware = (factoryConnection instanceof XAConnectionFactory) ;
-
         return factoryConnection ;
     }