[jboss-cvs] JBoss Messaging SVN: r5252 - branches/Branch_1_4/src/main/org/jboss/messaging/core/impl.

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

Author: clebert.suconic at jboss.com
Date: 2008-11-03 18:21:05 -0500 (Mon, 03 Nov 2008)
New Revision: 5252

Modified:
   branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/MessagingQueue.java
Log:
https://jira.jboss.org/jira/browse/JBMESSAGING-1429 - removing added synchronization because of test regression

Modified: branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/MessagingQueue.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/MessagingQueue.java	2008-11-03 21:27:38 UTC (rev 5251)
+++ branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/MessagingQueue.java	2008-11-03 23:21:05 UTC (rev 5252)
@@ -45,6 +45,7 @@
 import org.jboss.messaging.core.contract.Receiver;
 import org.jboss.messaging.core.impl.clusterconnection.MessageSucker;
 import org.jboss.messaging.core.impl.tx.Transaction;
+import org.jboss.messaging.util.ConcurrentHashSet;
 import org.jboss.util.timeout.Timeout;
 import org.jboss.util.timeout.TimeoutTarget;
 
@@ -91,7 +92,7 @@
 
    private boolean trace = log.isTraceEnabled();
    
-   private Set suckers;
+   private Set<MessageSucker> suckers;
    
    private boolean handleFlowControlForConsumers;
    
@@ -161,7 +162,7 @@
    	
    	distributor = new ClusterRoundRobinDistributor(localDistributor, remoteDistributor);
    	
-   	suckers = new HashSet();
+   	suckers = new ConcurrentHashSet<MessageSucker>();
    	
    	recoveryArea = new ConcurrentReaderHashMap();
    	
@@ -557,16 +558,13 @@
    
    private void informSuckers(boolean consume)
    {
-      synchronized (lock)
+      Iterator<MessageSucker> iter = suckers.iterator();
+
+      while (iter.hasNext())
       {
-      	Iterator iter = suckers.iterator();
-      	
-      	while (iter.hasNext())
-      	{
-      		MessageSucker sucker = (MessageSucker)iter.next();
-      		
-      		sucker.setConsuming(consume);
-      	}
+         MessageSucker sucker = iter.next();
+
+         sucker.setConsuming(consume);
       }
    }