[jboss-cvs] JBoss Messaging SVN: r6151 - in trunk: tests/src/org/jboss/messaging/tests/integration/cluster/distribution and 1 other directory.

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

Author: timfox
Date: 2009-03-24 10:45:53 -0400 (Tue, 24 Mar 2009)
New Revision: 6151

Modified:
   trunk/src/main/org/jboss/messaging/core/server/cluster/impl/RemoteQueueBindingImpl.java
   trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/SymmetricClusterTest.java
Log:
small tweak

Modified: trunk/src/main/org/jboss/messaging/core/server/cluster/impl/RemoteQueueBindingImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/cluster/impl/RemoteQueueBindingImpl.java	2009-03-24 13:52:00 UTC (rev 6150)
+++ trunk/src/main/org/jboss/messaging/core/server/cluster/impl/RemoteQueueBindingImpl.java	2009-03-24 14:45:53 UTC (rev 6151)
@@ -71,8 +71,6 @@
 
    private int consumerCount;
 
-  // private final boolean duplicateDetection;
-   
    private final SimpleString idsHeaderName;
    
    private int id;
@@ -84,8 +82,7 @@
                                  final SimpleString routingName,
                                  final int remoteQueueID,
                                  final SimpleString filterString,
-                                 final Queue storeAndForwardQueue,
-                              //   final boolean duplicateDetection,                      
+                                 final Queue storeAndForwardQueue,                     
                                  final SimpleString bridgeName,
                                  final int distance) throws Exception
    {
@@ -99,8 +96,6 @@
       
       this.remoteQueueID = remoteQueueID;
 
-    //  this.duplicateDetection = duplicateDetection;
-
       if (filterString != null)
       {
          queueFilter = new FilterImpl(filterString);
@@ -175,7 +170,7 @@
       return distance;
    }
 
-   public boolean isHighAcceptPriority(final ServerMessage message)
+   public synchronized boolean isHighAcceptPriority(final ServerMessage message)
    {      
       if (consumerCount == 0)
       {
@@ -225,20 +220,7 @@
       
       buff.putInt(remoteQueueID);
       
-      message.putBytesProperty(idsHeaderName, ids);           
-      
-      //TODO we can't use a GUID for duplicate detection, since this is not deterministic on live and backup
-      //So we just use bridge duplicate detection
-      
-//      //Now add a duplicate detection header, if required.
-//      //This MUST be deterministic on live and backup, and globally unique
-//      xx
-//      if (duplicateDetection)
-//      {
-//         byte[] guid = UUIDGenerator.getInstance().generateUUID().asBytes();
-//         
-//         message.putBytesProperty(MessageImpl.HDR_DUPLICATE_DETECTION_ID, guid);
-//      }
+      message.putBytesProperty(idsHeaderName, ids);                
    }
 
    public synchronized void addConsumer(final SimpleString filterString) throws Exception

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/SymmetricClusterTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/SymmetricClusterTest.java	2009-03-24 13:52:00 UTC (rev 6150)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/SymmetricClusterTest.java	2009-03-24 14:45:53 UTC (rev 6151)
@@ -1385,7 +1385,7 @@
       waitForBindings(4, "queues.testaddress", 7, 7, true);
 
       waitForBindings(0, "queues.testaddress", 23, 23, false);
-      waitForBindings(1, "queues.testaddress", 23, 23, false);
+      waitForBindings(1, "queues.testaddress", 23, 23, false); 
       waitForBindings(2, "queues.testaddress", 23, 23, false);
       waitForBindings(3, "queues.testaddress", 22, 22, false);
       waitForBindings(4, "queues.testaddress", 21, 21, false);