From 254a13efd9a313a8ba286fc8e8abbce31cbe29d3 Mon Sep 17 00:00:00 2001
From: borg-0300 <borg-0300@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Sat, 18 Mar 2006 15:20:50 +0000
Subject: [PATCH] MAXPATHLENGTH used

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@1925 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
 source/de/anomic/plasma/plasmaCrawlWorker.java | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/source/de/anomic/plasma/plasmaCrawlWorker.java b/source/de/anomic/plasma/plasmaCrawlWorker.java
index 2a4f9c1f4..80ed6851a 100644
--- a/source/de/anomic/plasma/plasmaCrawlWorker.java
+++ b/source/de/anomic/plasma/plasmaCrawlWorker.java
@@ -58,6 +58,7 @@ import de.anomic.http.httpHeader;
 import de.anomic.http.httpRemoteProxyConfig;
 import de.anomic.http.httpc;
 import de.anomic.http.httpdProxyHandler;
+import de.anomic.plasma.plasmaHTCache.Entry;
 import de.anomic.server.logging.serverLog;
 import de.anomic.tools.bitfield;
 import de.anomic.yacy.yacyCore;
@@ -356,6 +357,13 @@ public final class plasmaCrawlWorker extends Thread {
                 // TODO: aborting download if content is to long ...
                 //long contentLength = res.responseHeader.contentLength();
 
+                if (htCache.cacheFile.getAbsolutePath().length() > Entry.MAXPATHLENGTH) {
+                    remote.close();
+                    log.logInfo("REJECTED URL " + url.toString() + " because path too long '" +
+                                cacheManager.cachePath.getAbsolutePath() + "'");
+                    return (htCache = null);
+                }
+
                 // reserve cache entry
                 htCache = cacheManager.newEntry(requestDate, depth, url, name, requestHeader, res.status, res.responseHeader, initiator, profile);
                 if (!htCache.cacheFile.getCanonicalPath().startsWith(cacheManager.cachePath.getCanonicalPath())) {
@@ -364,13 +372,6 @@ public final class plasmaCrawlWorker extends Thread {
                     log.logInfo("REJECTED URL " + url.toString() + " because of an invalid file path ('" +
                                 htCache.cacheFile.getCanonicalPath() + "' does not start with '" +
                                 cacheManager.cachePath.getAbsolutePath() + "').");
-                    return null;                    
-                }
-
-                if (htCache.cacheFile.getAbsolutePath().length() > 255) {
-                    remote.close();
-                    log.logInfo("REJECTED URL " + url.toString() + " because path too long '" +
-                                cacheManager.cachePath.getAbsolutePath() + "'");                    
                     return (htCache = null);
                 }