From f0c9608e59cce823b20801889efa328e016eb33a Mon Sep 17 00:00:00 2001
From: gojomo <gojomo@daa5b2f2-a927-0410-8b2d-f5f262fa301a>
Date: Wed, 21 Oct 2009 22:55:06 +0000
Subject: [PATCH] Followup for [HER-1605] Refactor parameterizable policies out
 of frontier * CandidatesProcessor.java     remove misguided lock preventing
 intended parallelism of pre-enqueue URL prep

---
 .../postprocessor/CandidatesProcessor.java    | 75 ++++++++-----------
 1 file changed, 33 insertions(+), 42 deletions(-)

diff --git a/engine/src/main/java/org/archive/crawler/postprocessor/CandidatesProcessor.java b/engine/src/main/java/org/archive/crawler/postprocessor/CandidatesProcessor.java
index 6752f2d4..0381c84a 100644
--- a/engine/src/main/java/org/archive/crawler/postprocessor/CandidatesProcessor.java
+++ b/engine/src/main/java/org/archive/crawler/postprocessor/CandidatesProcessor.java
@@ -23,8 +23,6 @@ package org.archive.crawler.postprocessor;
 import static org.archive.modules.fetcher.FetchStatusCodes.S_DEFERRED;
 import static org.archive.modules.fetcher.FetchStatusCodes.S_PREREQUISITE_UNSCHEDULABLE_FAILURE;
 
-import java.util.concurrent.locks.ReentrantLock;
-
 import org.apache.commons.httpclient.URIException;
 import org.archive.crawler.framework.Frontier;
 import org.archive.crawler.reporting.CrawlerLoggerModule;
@@ -49,8 +47,6 @@ import org.springframework.beans.factory.annotation.Autowired;
  */
 public class CandidatesProcessor extends Processor {
     private static final long serialVersionUID = -3L;
-
-    ReentrantLock lock = new ReentrantLock(true);
     
     /**
      * Candidate chain
@@ -163,49 +159,44 @@ public class CandidatesProcessor extends Processor {
             curi.getOutLinks().clear();
             return;
         }
-        
-        try {
-            lock.lock();
-            for (Link wref: curi.getOutLinks()) {
-                CrawlURI candidate;
-                try {
-                    candidate = curi.createCrawlURI(curi.getBaseURI(),wref);
-                    // at least for duration of candidatechain, offer
-                    // access to full CrawlURI of via
-                    candidate.setFullVia(curi); 
-                } catch (URIException e) {
-                    loggerModule.logUriError(e, curi.getUURI(), 
-                            wref.getDestination().toString());
-                    continue;
+
+        for (Link wref: curi.getOutLinks()) {
+            CrawlURI candidate;
+            try {
+                candidate = curi.createCrawlURI(curi.getBaseURI(),wref);
+                // at least for duration of candidatechain, offer
+                // access to full CrawlURI of via
+                candidate.setFullVia(curi); 
+            } catch (URIException e) {
+                loggerModule.logUriError(e, curi.getUURI(), 
+                        wref.getDestination().toString());
+                continue;
+            }
+            sheetOverlaysManager.applyOverridesTo(candidate);
+            try {
+                KeyedProperties.clearOverridesFrom(curi); 
+                KeyedProperties.loadOverridesFrom(candidate);
+                
+                if(getSeedsRedirectNewSeeds() && curi.isSeed() 
+                        && wref.getHopType() == Hop.REFER) {
+                    candidate.setSeed(true); 
                 }
-                sheetOverlaysManager.applyOverridesTo(candidate);
-                try {
-                    KeyedProperties.clearOverridesFrom(curi); 
-                    KeyedProperties.loadOverridesFrom(candidate);
-                    
-                    if(getSeedsRedirectNewSeeds() && curi.isSeed() 
-                            && wref.getHopType() == Hop.REFER) {
-                        candidate.setSeed(true); 
+                getCandidateChain().process(candidate, null); 
+                if(candidate.getFetchStatus()>=0) {
+                    if(checkForSeedPromotion(candidate)) {
+                        getSeeds().addSeed(candidate);
+                    } else {
+                        frontier.schedule(candidate);
                     }
-                    getCandidateChain().process(candidate, null); 
-                    if(candidate.getFetchStatus()>=0) {
-                        if(checkForSeedPromotion(candidate)) {
-                            getSeeds().addSeed(candidate);
-                        } else {
-                            frontier.schedule(candidate);
-                        }
-                        curi.getOutCandidates().add(candidate);
-                    }
-                    
-                } finally {
-                    KeyedProperties.clearOverridesFrom(candidate); 
-                    KeyedProperties.loadOverridesFrom(curi);
+                    curi.getOutCandidates().add(candidate);
                 }
+                
+            } finally {
+                KeyedProperties.clearOverridesFrom(candidate); 
+                KeyedProperties.loadOverridesFrom(curi);
             }
-            curi.getOutLinks().clear();
-        } finally {
-            lock.unlock();
         }
+        curi.getOutLinks().clear();
     }
     
     /**