improved iterating over hashmap

2 files changed, 5 insertions, 12 deletions

diff --git a/src/eu/siacs/conversations/xmpp/XmppConnection.java b/src/eu/siacs/conversations/xmpp/XmppConnection.java
index b2829c6ea..824750f1e 100644
--- a/src/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -926,14 +926,10 @@ public class XmppConnection implements Runnable {
 
 	public List<String> findDiscoItemsByFeature(String feature) {
 		List<String> items = new ArrayList<String>();
-		Iterator<Entry<String, List<String>>> it = this.disco.entrySet()
-				.iterator();
-		while (it.hasNext()) {
-			Entry<String, List<String>> pairs = it.next();
-			if (pairs.getValue().contains(feature)) {
-				items.add(pairs.getKey());
+		for (Entry<String, List<String>> cursor : disco.entrySet()) {
+			if (cursor.getValue().contains(feature)) {
+				items.add(cursor.getKey());
 			}
-			it.remove();
 		}
 		return items;
 	}
diff --git a/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java b/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
index 1f2871944..7a867ef7b 100644
--- a/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
+++ b/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
@@ -507,10 +507,8 @@ public class JingleConnection {
 	
 	private JingleSocks5Transport chooseConnection() {
 		JingleSocks5Transport connection = null;
-		Iterator<Entry<String, JingleSocks5Transport>> it = this.connections.entrySet().iterator();
-	    while (it.hasNext()) {
-	    	Entry<String, JingleSocks5Transport> pairs = it.next();
-	    	JingleSocks5Transport currentConnection = pairs.getValue();
+		for (Entry<String, JingleSocks5Transport> cursor : connections.entrySet()) {
+	    	JingleSocks5Transport currentConnection = cursor.getValue();
 	    	//Log.d("xmppService","comparing candidate: "+currentConnection.getCandidate().toString());
 	        if (currentConnection.isEstablished()&&(currentConnection.getCandidate().isUsedByCounterpart()||(!currentConnection.getCandidate().isOurs()))) {
 	        	//Log.d("xmppService","is usable");
@@ -533,7 +531,6 @@ public class JingleConnection {
 	        		}
 	        	}
 	        }
-	        it.remove();
 	    }
 		return connection;
 	}