[jboss-svn-commits] JBL Code SVN: r18322 - in labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb: rosetta/pooling/xa and 1 other directory.

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

Author: mark.little at jboss.com
Date: 2008-02-05 14:26:39 -0500 (Tue, 05 Feb 2008)
New Revision: 18322

Modified:
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/couriers/JmsCourier.java
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/xa/XaJmsConnectionPool.java
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/xa/XaJmsConnectionPoolContainer.java
Log:
http://jira.jboss.com/jira/browse/JBESB-1438

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/couriers/JmsCourier.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/couriers/JmsCourier.java	2008-02-05 19:19:43 UTC (rev 18321)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/couriers/JmsCourier.java	2008-02-05 19:26:39 UTC (rev 18322)
@@ -373,7 +373,7 @@
                         }
                         _messageProducer.setDeliveryMode(_epr.getPersistent()?DeliveryMode.PERSISTENT:DeliveryMode.NON_PERSISTENT);
                         if ( _logger.isDebugEnabled() )
-                            _logger.debug(" JMSCourier deliveryMode: " + _messageProducer.getDeliveryMode() + ", peristent:" + _epr.getPersistent());
+                            _logger.debug("JMSCourier deliveryMode: " + _messageProducer.getDeliveryMode() + ", peristent:" + _epr.getPersistent());
                     }
                     catch (JMSException ex) {
                         _logger.debug("Error from JMS system.", ex);
@@ -451,7 +451,7 @@
                     if (tx == null)
                 	jmsConnectionPool = JmsConnectionPoolContainer.getPool(properties, sFactoryClass, sType, username, password, transacted);
                     else
-                	jmsConnectionPool = XaJmsConnectionPoolContainer.getPool(properties, sFactoryClass, sType, username, password, transacted, tx);
+                	jmsConnectionPool = XaJmsConnectionPoolContainer.getPool(properties, sFactoryClass, sType, username, password, true, tx);  // force transacted to be true!
                 }
             }
         }

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/xa/XaJmsConnectionPool.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/xa/XaJmsConnectionPool.java	2008-02-05 19:19:43 UTC (rev 18321)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/xa/XaJmsConnectionPool.java	2008-02-05 19:26:39 UTC (rev 18322)
@@ -60,12 +60,12 @@
 	    /*
 	     * If there is a global transaction in place then make sure
 	     * we grab the right connection, irrespective of the provider
-	     * info - assume JCA.
+	     * info.
 	     */
 
         	if (TransactionStrategy.getTransactionStrategy(true).getTransaction() != null)
         	{
-        	    if ("XAConnectionFactory".equals(name))
+        	    if (("XAConnectionFactory".equals(name)) || ("ConnectionFactory".equals(name)))
                 	return "java:/JmsXA";
         	}
         	

Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/xa/XaJmsConnectionPoolContainer.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/xa/XaJmsConnectionPoolContainer.java	2008-02-05 19:19:43 UTC (rev 18321)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/rosetta/src/org/jboss/internal/soa/esb/rosetta/pooling/xa/XaJmsConnectionPoolContainer.java	2008-02-05 19:26:39 UTC (rev 18322)
@@ -49,9 +49,12 @@
 
 	    if (connection == null)
 	    {
+		// we could override the connectionfactory name here ...
+		// in fact we could change all of the info here if necessary ...
+		
 		Map<String, String> poolKey = createPoolKey(enviroment,
 			connectionFactory, destinationType, username, password,
-			transacted);
+			true);  // force transacted to be true
 		XaJmsConnectionPool pool = new XaJmsConnectionPool(poolKey);
 
 		transactions.put(transaction, pool);