From 28baecd41b5797acd67b9bd5e75accd6a1c8be7c Mon Sep 17 00:00:00 2001
From: orbiter <orbiter@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Sat, 30 Jun 2007 23:01:57 +0000
Subject: [PATCH] another fix for the concurrentModificationException in
 AccessTracker

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3944 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
 htroot/AccessTracker_p.java                       | 12 ++++++++++--
 source/de/anomic/server/serverAbstractSwitch.java |  6 +++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/htroot/AccessTracker_p.java b/htroot/AccessTracker_p.java
index 55ca281c8..5310dc7b3 100644
--- a/htroot/AccessTracker_p.java
+++ b/htroot/AccessTracker_p.java
@@ -45,6 +45,14 @@ import de.anomic.yacy.yacySeed;
 
 public class AccessTracker_p {
     
+	private static final TreeMap treemapclone(TreeMap m) {
+		TreeMap accessClone = new TreeMap();
+		try {
+			accessClone.putAll(m);
+		} catch (ConcurrentModificationException e) {}
+		return accessClone;
+	}
+	
     public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch sb) {
         plasmaSwitchboard switchboard = (plasmaSwitchboard) sb;
      
@@ -85,7 +93,7 @@ public class AccessTracker_p {
 				access = switchboard.accessTrack(host);
 				if (access != null) {
 					try {
-						Iterator ii = access.entrySet().iterator();
+						Iterator ii = treemapclone(access).entrySet().iterator();
 						while (ii.hasNext()) {
 							entry = (Map.Entry) ii.next();
 							prop.put("page_list_" + entCount + "_host", host);
@@ -101,7 +109,7 @@ public class AccessTracker_p {
                     while ((entCount < maxCount) && (i.hasNext())) {
 						host = (String) i.next();
 						access = switchboard.accessTrack(host);
-						Iterator ii = access.entrySet().iterator();
+						Iterator ii = treemapclone(access).entrySet().iterator();
 						while (ii.hasNext()) {
 							entry = (Map.Entry) ii.next();
 							prop.put("page_list_" + entCount + "_host", host);
diff --git a/source/de/anomic/server/serverAbstractSwitch.java b/source/de/anomic/server/serverAbstractSwitch.java
index 8b7564798..7a0c9db8e 100644
--- a/source/de/anomic/server/serverAbstractSwitch.java
+++ b/source/de/anomic/server/serverAbstractSwitch.java
@@ -208,7 +208,11 @@ public abstract class serverAbstractSwitch implements serverSwitch {
     
     public Iterator accessHosts() {
         // returns an iterator of hosts in tracker (String)
-        return accessTracker.keySet().iterator();
+    	HashMap accessTrackerClone = new HashMap();
+    	try {
+    		accessTrackerClone.putAll(accessTracker);
+    	} catch (ConcurrentModificationException e) {}
+    	return accessTrackerClone.keySet().iterator();
     }
 
     public void setConfig(Map otherConfigs) {