Fixed for count == 0 and Policy is one

code cleanup
Netflix · Sep 10, 2020 · af2e8fa · af2e8fa
1 parent df9db13
commit af2e8fa
Showing 1 changed file with 11 additions and 19 deletions.
diff --git a/evcache-core/src/main/java/com/netflix/evcache/operation/EVCacheLatchImpl.java b/evcache-core/src/main/java/com/netflix/evcache/operation/EVCacheLatchImpl.java
@@ -171,28 +171,20 @@ public List<Future<Boolean>> getCompletedFutures() {
     }
 
     private int policyToCount(Policy policy, int count) {
-        if (policy == null) return 0;
+        if (policy == null || count == 0) return 0;
         switch (policy) {
-        case NONE:
-            return 0;
-        case ONE:
-            return 1;
-        case QUORUM:
-            if (count == 0)
+            case NONE:
                 return 0;
-            else if (count <= 2)
+            case ONE:
                 return 1;
-            else
-                return (futures.size() / 2) + 1;
-        case ALL_MINUS_1:
-            if (count == 0)
-                return 0;
-            else if (count <= 2)
-                return 1;
-            else
-                return count - 1;
-        default:
-            return count;
+            case QUORUM:
+                if (count <= 2) return 1;
+                else return (futures.size() / 2) + 1;
+            case ALL_MINUS_1:
+                if (count <= 2) return 1;
+                else return count - 1;
+            default:
+                return count;
         }
     }