fixing LimitedRoundRobinSelector (instances got stuck at waitNodesCre…

…ation)
choreos · Apr 11, 2014 · 06a13b3 · 06a13b3
1 parent 7fae51d
commit 06a13b3
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/Commons/src/main/java/org/ow2/choreos/selectors/LimitedRoundRobinSelector.java b/Commons/src/main/java/org/ow2/choreos/selectors/LimitedRoundRobinSelector.java
@@ -95,11 +95,17 @@ private int defineNewQty(List<T> objects, int objectsQuantity) {
     private List<T> selectInCreatingState(List<T> objects, R requirements, int objectsQuantity, int newQty)
             throws NotSelectedException {
 
-        List<T> result = this.alwaysCreatorSelector.select(requirements, newQty);
-        synchronized (this) {
-            objectsBeenCreated.set(objectsBeenCreated.get() - newQty);
+        List<T> result = null;
+        try {
+            result = this.alwaysCreatorSelector.select(requirements, newQty);
+        } catch (NotSelectedException e) {
+            throw e;
+        } finally {
+            synchronized (this) {
+                objectsBeenCreated.set(objectsBeenCreated.get() - newQty);
+            }
         }
-
+        
         if (result.size() < objectsQuantity) {
             int diff = objectsQuantity = result.size();
             List<T> moreNodes = this.roundRobinSelector.select(requirements, diff);