[jboss-cvs] JBoss Messaging SVN: r2974 - in trunk/src/main/org/jboss: messaging/core/impl/clusterconnection and 1 other directory.

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

Author: timfox
Date: 2007-08-07 16:09:55 -0400 (Tue, 07 Aug 2007)
New Revision: 2974

Modified:
   trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
   trunk/src/main/org/jboss/messaging/core/impl/clusterconnection/MessageSucker.java
Log:
tests speedup


Modified: trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java	2007-08-07 19:43:08 UTC (rev 2973)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java	2007-08-07 20:09:55 UTC (rev 2974)
@@ -1331,8 +1331,10 @@
    		waitingToClose = false;
    	}
    }
-   
-   void handleDelivery(Delivery delivery, ServerConsumerEndpoint consumer) throws Exception
+  
+   //TODO NOTE! This needs to be synchronized to prevent deliveries coming back
+   //out of order! There maybe some better way of doing this 
+   synchronized void handleDelivery(Delivery delivery, ServerConsumerEndpoint consumer) throws Exception
    {
    	 long deliveryId = -1;
    	 

Modified: trunk/src/main/org/jboss/messaging/core/impl/clusterconnection/MessageSucker.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/clusterconnection/MessageSucker.java	2007-08-07 19:43:08 UTC (rev 2973)
+++ trunk/src/main/org/jboss/messaging/core/impl/clusterconnection/MessageSucker.java	2007-08-07 20:09:55 UTC (rev 2974)
@@ -293,7 +293,8 @@
 				
 				tx.delistResource(localSession.getXAResource(), XAResource.TMSUCCESS);
 				
-				tx.commit();
+			//	tx.commit();
+tm.commit();
 				
 				if (trace) { log.trace("Committed JTA transaction"); }
 			}
@@ -312,7 +313,7 @@
 			
 			try
 			{
-				if (tx != null) tx.rollback();
+				if (tx != null) tm.rollback();
 			}
 			catch (Throwable t)
 			{