[jboss-cvs] JBoss Messaging SVN: r4193 - trunk/src/main/org/jboss/messaging/core/client/impl.

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

Author: timfox
Date: 2008-05-14 11:29:44 -0400 (Wed, 14 May 2008)
New Revision: 4193

Modified:
   trunk/src/main/org/jboss/messaging/core/client/impl/ClientProducerImpl.java
   trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java
Log:
Don't send messages blocking if session  is transacted!


Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientProducerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientProducerImpl.java	2008-05-14 14:25:01 UTC (rev 4192)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientProducerImpl.java	2008-05-14 15:29:44 UTC (rev 4193)
@@ -68,6 +68,8 @@
    //For rate throttling
      
    private final TokenBucketLimiter rateLimiter;
+   
+   private final boolean transactional;
      
    // Static ---------------------------------------------------------------------------------------
 
@@ -77,7 +79,7 @@
                              final long clientTargetID,
    		                    final SimpleString address,
    		                    final RemotingConnection remotingConnection, final int windowSize,
-   		                    final int maxRate)
+   		                    final int maxRate, final boolean transactional)
    {   	
       this.session = session;
       
@@ -99,6 +101,8 @@
       {
       	this.rateLimiter = null;
       }
+      
+      this.transactional = transactional;
    }
    
    // ClientProducer implementation ----------------------------------------------------------------
@@ -157,7 +161,7 @@
 //   		windowSize--;
 //   	}
    	
-   	if (msg.isDurable())
+   	if (msg.isDurable() && !transactional)
    	{
    	   remotingConnection.sendBlocking(serverTargetID, session.getServerTargetID(), message);
    	}

Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java	2008-05-14 14:25:01 UTC (rev 4192)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java	2008-05-14 15:29:44 UTC (rev 4193)
@@ -342,7 +342,7 @@
       	
       	producer = new ClientProducerImpl(this, response.getProducerTargetID(), clientTargetID, address,
       			                            remotingConnection, response.getWindowSize(),
-      			                            response.getMaxRate());  
+      			                            response.getMaxRate(), !autoCommitSends);  
       	
       	remotingConnection.getPacketDispatcher().register(new ClientProducerPacketHandler(producer, clientTargetID));
       }