--- miscJava/CircuitBreaker/src/main/java/dk/thoerup/circuitbreaker/CircuitBreakerManager.java 2015/06/09 09:14:28 2571 +++ miscJava/CircuitBreaker/src/main/java/dk/thoerup/circuitbreaker/CircuitBreakerManager.java 2015/06/09 09:28:14 2572 @@ -1,7 +1,7 @@ package dk.thoerup.circuitbreaker; -import java.util.Iterator; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; @@ -41,11 +41,11 @@ } public void shutdown() { - for (Iterator it = breakers.keySet().iterator(); it.hasNext(); ) { - String key = it.next(); - breakers.get(key).shutdown(); - it.remove(); + + for ( Entry entry : breakers.entrySet() ) { + entry.getValue().shutdown(); } + breakers.clear(); } }