[jboss-cvs] JBoss Messaging SVN: r5762 - trunk/src/main/org/jboss/messaging/core/client/impl.

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

Author: ataylor
Date: 2009-01-29 15:11:12 -0500 (Thu, 29 Jan 2009)
New Revision: 5762

Modified:
   trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionManagerImpl.java
Log:
https://jira.jboss.org/jira/browse/JBMESSAGING-1488 - simpler fix, just set to null

Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionManagerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionManagerImpl.java	2009-01-29 19:20:36 UTC (rev 5761)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionManagerImpl.java	2009-01-29 20:11:12 UTC (rev 5762)
@@ -756,6 +756,8 @@
             {
             }
          }
+
+         mapIterator = null;
       }
    }
 
@@ -811,7 +813,7 @@
 
          if (mapIterator == null || !mapIterator.hasNext())
          {
-            mapIterator = new ConnectionHolderIterator(connections.values().iterator());
+            mapIterator = connections.values().iterator();
          }
 
          ConnectionEntry entry = mapIterator.next();
@@ -930,45 +932,6 @@
       }
    }
 
-   private class ConnectionHolderIterator implements Iterator<ConnectionEntry>
-   {
-      Iterator<ConnectionEntry> it;
 
-      public ConnectionHolderIterator(Iterator<ConnectionEntry> connectionEntryIterator)
-      {
-         it = connectionEntryIterator;
-      }
-
-      public boolean hasNext()
-      {
-         try
-         {
-            return it.hasNext();
-         }
-         catch (ConcurrentModificationException e)
-         {
-            it = connections.values().iterator();
-            return it.hasNext();
-         }
-      }
-
-      public ConnectionEntry next()
-      {
-         try
-         {
-            return it.next();
-         }
-         catch (ConcurrentModificationException e)
-         {
-            it = connections.values().iterator();
-            return it.next();
-         }
-      }
-
-      public void remove()
-      {
-         throw new UnsupportedOperationException();
-      }
-   }
   
 }