Fixed removeAll bug - should be ready for primetime

buglabs · Sep 28, 2011 · 5bc453b · 5bc453b
1 parent 7169405
commit 5bc453b
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/com.buglabs.xbee/com/buglabs/xbee/XBeeMonitor.java b/com.buglabs.xbee/com/buglabs/xbee/XBeeMonitor.java
@@ -219,10 +219,9 @@ public void addPredictive(Class proto) {
 
 	@Override
 	public void removeAll(Class proto) {
-		dlog("removing "+proto.getName()+" from list...");
 		boolean success = expectedProtocols.remove(proto);
-		dlog("..."+success);
-		for (Map.Entry<XBeeAddress, XBeeProtocol> entry : protocols.entrySet()){
+		Map<XBeeAddress, XBeeProtocol> copyOfProtocols = new HashMap<XBeeAddress, XBeeProtocol>(protocols);
+		for (Map.Entry<XBeeAddress, XBeeProtocol> entry : copyOfProtocols.entrySet()){
 			if (entry.getValue().getClass() == proto){
 				dlog("removing protocol at "+ByteUtils.toBase16(entry.getKey().getAddress()));
 				protocols.remove(entry.getKey());