[jboss-cvs] JBoss Messaging SVN: r3206 - in trunk/src/main/org/jboss: messaging/core/contract and 1 other directories.

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

Author: timfox
Date: 2007-10-19 09:33:19 -0400 (Fri, 19 Oct 2007)
New Revision: 3206

Modified:
   trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
   trunk/src/main/org/jboss/messaging/core/contract/PostOffice.java
   trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
Log:
Reverse tweak


Modified: trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java	2007-10-19 13:22:08 UTC (rev 3205)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java	2007-10-19 13:33:19 UTC (rev 3206)
@@ -179,9 +179,6 @@
    
    private Object waitLock = new Object();
    
-   
-   private boolean dosync = true;
-   
    // Constructors ---------------------------------------------------------------------------------
 
    ServerSessionEndpoint(String sessionID, ServerConnectionEndpoint connectionEndpoint) throws Exception
@@ -621,7 +618,7 @@
                
                if (supportsFailover)
                {
-               	postOffice.sendReplicateDeliveryMessage(queueName, id, del.getReference().getMessage().getMessageID(), deliveryId, false, true, true);
+               	postOffice.sendReplicateDeliveryMessage(queueName, id, del.getReference().getMessage().getMessageID(), deliveryId, false, true);
                }
             }
          }
@@ -1370,7 +1367,7 @@
       		 if (toDeliver.peek() == rec)
       		 {
       			 toDeliver.take();
-      			 
+
       			 performDelivery(delivery.getReference(), deliveryId, consumer);
       		 }
       	 }
@@ -1393,12 +1390,10 @@
          	 rec.waitingForResponse = true;      	 
          	 
          	 toDeliver.put(rec);
-         	 
+         	  
          	 postOffice.sendReplicateDeliveryMessage(consumer.getQueueName(), id,
                                                      delivery.getReference().getMessage().getMessageID(),
-                                                     deliveryId, true, false, dosync);
-         	 
-         	 performDelivery(delivery.getReference(), deliveryId, consumer);
+                                                     deliveryId, true, false);
       	 }
       	 else
       	 {

Modified: trunk/src/main/org/jboss/messaging/core/contract/PostOffice.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/contract/PostOffice.java	2007-10-19 13:22:08 UTC (rev 3205)
+++ trunk/src/main/org/jboss/messaging/core/contract/PostOffice.java	2007-10-19 13:33:19 UTC (rev 3206)
@@ -143,7 +143,7 @@
    
    //FIXME - these do not belong here - only here temporarily until we implement generic Handler/Message abstraction
    
-   void sendReplicateDeliveryMessage(String queueName, String sessionID, long messageID, long deliveryID, boolean reply, boolean sync, boolean bodge)
+   void sendReplicateDeliveryMessage(String queueName, String sessionID, long messageID, long deliveryID, boolean reply, boolean sync)
    	throws Exception;
 
 	void sendReplicateAckMessage(String queueName, long messageID) throws Exception;

Modified: trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java	2007-10-19 13:22:08 UTC (rev 3205)
+++ trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java	2007-10-19 13:33:19 UTC (rev 3206)
@@ -612,7 +612,7 @@
    //TODO - these don't belong here
        
    public void sendReplicateDeliveryMessage(String queueName, String sessionID, long messageID, long deliveryID,
-   		                                   boolean reply, boolean sync, boolean bodgesync)
+   		                                   boolean reply, boolean sync)
    	throws Exception
    {
    	//We use a semaphore to limit the number of outstanding replicates we can send without getting a response
@@ -631,7 +631,7 @@
 	   	   	   		   
 	   	Address replyAddress = null;
 	   	
-	   	if (reply && !bodgesync)
+	   	if (reply)
 	   	{
 	   		//TODO optimise this
 	   		
@@ -648,15 +648,8 @@
 		   Address address = getFailoverNodeDataChannelAddress();
 		   	
 		   if (address != null)
-		   {	  
-		   	if (bodgesync)
-		   	{
-		   		groupMember.unicastControl(request, address, true);
-		   	}
-		   	else
-		   	{
-		   		groupMember.unicastData(request, address);
-		   	}
+		   {	   
+		   	groupMember.unicastData(request, address);
 		   }
    	}
    	catch (Exception e)