svn commit: r797420 - /synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/RoundRobin.java

[azeez]

Author: azeez
Date: Fri Jul 24 11:31:25 2009
New Revision: 797420

URL: http://svn.apache.org/viewvc?rev=797420&view=rev
Log:
No need to synchronize the getNextEndpoint method since it is synced based on 
this

Modified:
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/RoundRobin.java

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/RoundRobin.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/RoundRobin.java?rev=797420&r1=797419&r2=797420&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/RoundRobin.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/RoundRobin.java
 Fri Jul 24 11:31:25 2009
@@ -62,36 +62,34 @@
      * Choose an active endpoint using the round robin algorithm. If there are 
no active endpoints
      * available, returns null.
      *
-     * @param synCtx MessageContext instance which holds all per-message 
properties
-     * @param  algorithmContext The context in which holds run time states 
related to the algorithm
+     * @param synCtx           MessageContext instance which holds all 
per-message properties
+     * @param algorithmContext The context in which holds run time states 
related to the algorithm
      * @return endpoint to send the next message
      */
     public Endpoint getNextEndpoint(MessageContext synCtx, AlgorithmContext 
algorithmContext) {
 
         Endpoint nextEndpoint;
         int attempts = 0;
-        synchronized (algorithmContext) {
-            int currentEPR = algorithmContext.getCurrentEndpointIndex();
-            do {
-                // two successive clients could get the same endpoint if not 
synchronized.
-                synchronized (this) {
-                    nextEndpoint = (Endpoint) endpoints.get(currentEPR);
-
-                    if (currentEPR == endpoints.size() - 1) {
-                        currentEPR = 0;
-                    } else {
-                        currentEPR++;
-                    }
-                    algorithmContext.setCurrentEndpointIndex(currentEPR);
+        int currentEPR = algorithmContext.getCurrentEndpointIndex();
+        do {
+            // two successive clients could get the same endpoint if not 
synchronized.
+            synchronized (this) {
+                nextEndpoint = (Endpoint) endpoints.get(currentEPR);
+
+                if (currentEPR == endpoints.size() - 1) {
+                    currentEPR = 0;
+                } else {
+                    currentEPR++;
                 }
+                algorithmContext.setCurrentEndpointIndex(currentEPR);
+            }
 
-                attempts++;
-                if (attempts > endpoints.size()) {
-                    return null;
-                }
+            attempts++;
+            if (attempts > endpoints.size()) {
+                return null;
+            }
 
-            } while (!nextEndpoint.readyToSend());
-        }
+        } while (!nextEndpoint.readyToSend());
 
         return nextEndpoint;
     }
@@ -113,7 +111,7 @@
                 currentMemberIndex++;
             }
             algorithmContext.setCurrentEndpointIndex(currentMemberIndex);
-            if(log.isDebugEnabled()) {
+            if (log.isDebugEnabled()) {
                 log.debug("Members       : " + members.size());
                 log.debug("Current member: " + current);
             }