MCM: more fine-grained synchronized { } blocks

Author: Alexandru Scvortov

test/src/com/rabbitmq/examples/MulticastMain.java

@@ -287,7 +287,7 @@ public synchronized void handleBasicReturn(int replyCode,
             returnCount++;
         }
 
-        public synchronized void handleAck(long seqNo, boolean multiple) {
+        public void handleAck(long seqNo, boolean multiple) {
             int numConfirms = 0;
             if (multiple) {
                 for (long i = ackSet.first(); i <= seqNo; ++i) {
@@ -300,7 +300,7 @@ public synchronized void handleAck(long seqNo, boolean multiple) {
                 ackSet.remove(seqNo);
                 numConfirms = 1;
             }
-            confirmCount += numConfirms;
+            addConfirms(numConfirms);
 
             if (confirmPool != null) {
                 for (int i = 0; i < numConfirms; ++i) {
@@ -309,6 +309,10 @@ public synchronized void handleAck(long seqNo, boolean multiple) {
             }
         }
 
+        private synchronized void addConfirms(int numConfirms) {
+            confirmCount += numConfirms;
+        }
+
         public synchronized void resetCounts() {
             msgCount = 0;
             returnCount = 0;