[jboss-cvs] JBossAS SVN: r74343 - trunk/connector/src/main/org/jboss/resource/connectionmanager.

[jboss-cvs-commits at lists.jboss.org]

Author: jesper.pedersen
Date: 2008-06-10 04:50:20 -0400 (Tue, 10 Jun 2008)
New Revision: 74343

Modified:
   trunk/connector/src/main/org/jboss/resource/connectionmanager/CachedConnectionManager.java
Log:
[JBAS-1082] Use entrySet() for iterator

Modified: trunk/connector/src/main/org/jboss/resource/connectionmanager/CachedConnectionManager.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/connectionmanager/CachedConnectionManager.java	2008-06-10 08:49:25 UTC (rev 74342)
+++ trunk/connector/src/main/org/jboss/resource/connectionmanager/CachedConnectionManager.java	2008-06-10 08:50:20 UTC (rev 74343)
@@ -353,10 +353,12 @@
          return; //not participating properly in this management scheme.
 
       Map cmToConnectionsMap = key.getCMToConnectionsMap();
-      for (Iterator i = cmToConnectionsMap.keySet().iterator(); i.hasNext();)
+      Iterator cmToConnectionsMapIterator = cmToConnectionsMap.entrySet().iterator();
+      while (cmToConnectionsMapIterator.hasNext())
       {
-         ConnectionCacheListener cm = (ConnectionCacheListener) i.next();
-         Collection conns = (Collection) cmToConnectionsMap.get(cm);
+         Map.Entry cmToConnectionsMapEntry = (Map.Entry)cmToConnectionsMapIterator.next();
+         ConnectionCacheListener cm = (ConnectionCacheListener) cmToConnectionsMapEntry.getKey();
+         Collection conns = (Collection) cmToConnectionsMapEntry.getValue();
          cm.transactionStarted(conns);
       }
    }
@@ -381,10 +383,12 @@
             return;
       }
       key.setCMToConnectionsMap(cmToConnectionsMap);
-      for (Iterator i = cmToConnectionsMap.keySet().iterator(); i.hasNext();)
+      Iterator cmToConnectionsMapIterator = cmToConnectionsMap.entrySet().iterator();
+      while (cmToConnectionsMapIterator.hasNext())
       {
-         ConnectionCacheListener cm = (ConnectionCacheListener) i.next();
-         Collection conns = (Collection) cmToConnectionsMap.get(cm);
+         Map.Entry cmToConnectionsMapEntry = (Map.Entry)cmToConnectionsMapIterator.next();
+         ConnectionCacheListener cm = (ConnectionCacheListener) cmToConnectionsMapEntry.getKey();
+         Collection conns = (Collection) cmToConnectionsMapEntry.getValue();
          cm.reconnect(conns, unsharableResources);
       }
    }
@@ -399,10 +403,12 @@
          {
             objectToConnectionManagerMap.put(key, cmToConnectionsMap);
          }
-         for (Iterator i = cmToConnectionsMap.keySet().iterator(); i.hasNext();)
+         Iterator cmToConnectionsMapIterator = cmToConnectionsMap.entrySet().iterator();
+         while (cmToConnectionsMapIterator.hasNext())
          {
-            ConnectionCacheListener cm = (ConnectionCacheListener) i.next();
-            Collection conns = (Collection) cmToConnectionsMap.get(cm);
+            Map.Entry cmToConnectionsMapEntry = (Map.Entry)cmToConnectionsMapIterator.next();
+            ConnectionCacheListener cm = (ConnectionCacheListener) cmToConnectionsMapEntry.getKey();
+            Collection conns = (Collection) cmToConnectionsMapEntry.getValue();
             cm.disconnect(conns, unsharableResources);
          }
       }