From ea4a9b1301cde3e847e0d84dfd2971dd776c6bd5 Mon Sep 17 00:00:00 2001
From: Palash Nandi <palash.nandi42@gmail.com>
Date: Sat, 12 Sep 2020 19:16:53 +0530
Subject: [PATCH] Update WeightedRoundRobin.java

---
 .../src/main/java/algorithms/WeightedRoundRobin.java           | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/service-orchestrator/src/main/java/algorithms/WeightedRoundRobin.java b/service-orchestrator/src/main/java/algorithms/WeightedRoundRobin.java
index 55f0d36..482efc4 100644
--- a/service-orchestrator/src/main/java/algorithms/WeightedRoundRobin.java
+++ b/service-orchestrator/src/main/java/algorithms/WeightedRoundRobin.java
@@ -28,14 +28,13 @@ public class WeightedRoundRobin implements Router {
         synchronized (this.lock) {
             nodes.remove(node);
             assignTo--;
-            if(assignTo < 0 ) assignTo = 0;
             currentNodeAssignments = 0;
         }
     }
 
     public Node getAssignedNode(Request request) {
         synchronized (this.lock) {
-            assignTo = assignTo % nodes.size();
+            assignTo = (assignTo + nodes.size()) % nodes.size();
             final var currentNode = nodes.get(assignTo);
             currentNodeAssignments++;
             if (currentNodeAssignments == currentNode.getWeight()) {