From 0bc6284e274e6a94ce3086b96e7d08620bfe4219 Mon Sep 17 00:00:00 2001 From: orbiter Date: Sat, 25 Sep 2010 21:10:50 +0000 Subject: [PATCH] - added bugfix for access tracker in case of concurrency conflicts - added missing entry for new icu4j path in Mac App git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7188 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- addon/YaCy.app/Contents/Info.plist | 1 + source/de/anomic/server/serverAccessTracker.java | 1 + 2 files changed, 2 insertions(+) diff --git a/addon/YaCy.app/Contents/Info.plist b/addon/YaCy.app/Contents/Info.plist index cee5a4604..26776c7e9 100644 --- a/addon/YaCy.app/Contents/Info.plist +++ b/addon/YaCy.app/Contents/Info.plist @@ -51,6 +51,7 @@ $JAVAROOT/lib/httpclient-4.0.1.jar $JAVAROOT/lib/httpcore-4.0.1.jar $JAVAROOT/lib/httpmime-4.0.1.jar + $JAVAROOT/lib/icu4j-core.jar $JAVAROOT/lib/jakarta-oro-2.0.8.jar $JAVAROOT/lib/jcifs-1.3.14.jar $JAVAROOT/lib/jsch-0.1.42.jar diff --git a/source/de/anomic/server/serverAccessTracker.java b/source/de/anomic/server/serverAccessTracker.java index b65b674b2..a5cd24f80 100644 --- a/source/de/anomic/server/serverAccessTracker.java +++ b/source/de/anomic/server/serverAccessTracker.java @@ -102,6 +102,7 @@ public class serverAccessTracker { */ public int latestAccessCount(final String host, long delta) { Collection timeList = accessTrack(host); + if (timeList == null) return 0; long time = System.currentTimeMillis() - delta; int c = 0; for (Track l: timeList) if ( l != null && l.getTime() > time) c++;