svn commit: r1544526 - /manifoldcf/branches/CONNECTORS-781/framework/agents/src/main/java/org/apache/manifoldcf/agents/system/ManifoldCF.java

[kwright]

Author: kwright
Date: Fri Nov 22 13:12:22 2013
New Revision: 1544526

URL: http://svn.apache.org/r1544526
Log:
Refactor runningHash to use java 1.5 constructs.

Modified:
    
manifoldcf/branches/CONNECTORS-781/framework/agents/src/main/java/org/apache/manifoldcf/agents/system/ManifoldCF.java

Modified: 
manifoldcf/branches/CONNECTORS-781/framework/agents/src/main/java/org/apache/manifoldcf/agents/system/ManifoldCF.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-781/framework/agents/src/main/java/org/apache/manifoldcf/agents/system/ManifoldCF.java?rev=1544526&r1=1544525&r2=1544526&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-781/framework/agents/src/main/java/org/apache/manifoldcf/agents/system/ManifoldCF.java
 (original)
+++ 
manifoldcf/branches/CONNECTORS-781/framework/agents/src/main/java/org/apache/manifoldcf/agents/system/ManifoldCF.java
 Fri Nov 22 13:12:22 2013
@@ -31,7 +31,7 @@ public class ManifoldCF extends org.apac
   protected static boolean agentsInitialized = false;
   
   /** This is the place we keep track of the agents we've started. */
-  protected static HashMap runningHash = new HashMap();
+  protected static Map<String,IAgent> runningHash = new 
HashMap<String,IAgent>();
   /** This flag prevents startAgents() from starting anything once 
stopAgents() has been called. */
   protected static boolean stopAgentsRun = false;
   
@@ -182,15 +182,15 @@ public class ManifoldCF extends org.apac
   {
     synchronized (runningHash)
     {
-      HashMap iterHash = (HashMap)runningHash.clone();
-      Iterator iter = iterHash.keySet().iterator();
+      // This is supposedly safe; iterator remove is used
+      Iterator<String> iter = runningHash.keySet().iterator();
       while (iter.hasNext())
       {
-        String className = (String)iter.next();
-        IAgent agent = (IAgent)runningHash.get(className);
+        String className = iter.next();
+        IAgent agent = runningHash.get(className);
         // Stop it
         agent.stopAgent();
-        runningHash.remove(className);
+        iter.remove();
       }
     }
     // Done.