svn commit: r1615716 - /manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java

[kwright]

Author: kwright
Date: Mon Aug  4 18:13:06 2014
New Revision: 1615716

URL: http://svn.apache.org/r1615716
Log:
Add illegal argument exception so we don't get NPEs later

Modified:
    
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java

Modified: 
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java?rev=1615716&r1=1615715&r2=1615716&view=diff
==============================================================================
--- 
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java
 (original)
+++ 
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java
 Mon Aug  4 18:13:06 2014
@@ -1280,7 +1280,7 @@ public class WorkerThread extends Thread
     {
       String documentIdentifierHash = ManifoldCF.hash(documentIdentifier);
       String componentIdentifierHash = 
computeComponentIDHash(componentIdentifier);
-      IPipelineSpecificationWithVersions spec = 
computePipelineSpecification(documentIdentifierHash,componentIdentifierHash);
+      IPipelineSpecificationWithVersions spec = 
computePipelineSpecification(documentIdentifierHash,componentIdentifierHash,documentIdentifier);
       return 
ingester.checkFetchDocument(spec,newVersionString,parameterVersion,connection.getACLAuthority());
     }
 
@@ -1598,7 +1598,7 @@ public class WorkerThread extends Thread
         
       // First, we need to add into the metadata the stuff from the job 
description.
       ingester.documentIngest(
-        
computePipelineSpecification(documentIdentifierHash,componentIdentifierHash),
+        
computePipelineSpecification(documentIdentifierHash,componentIdentifierHash,documentIdentifier),
         connectionName,documentIdentifierHash,componentIdentifierHash,
         version,parameterVersion,
         connection.getACLAuthority(),
@@ -1641,7 +1641,7 @@ public class WorkerThread extends Thread
       
checkMultipleDispositions(documentIdentifier,componentIdentifier,componentIdentifierHash);
 
       ingester.documentNoData(
-        
computePipelineSpecification(documentIdentifierHash,componentIdentifierHash),
+        
computePipelineSpecification(documentIdentifierHash,componentIdentifierHash,documentIdentifier),
         connectionName,documentIdentifierHash,componentIdentifierHash,
         version,parameterVersion,
         connection.getACLAuthority(),
@@ -2142,9 +2142,13 @@ public class WorkerThread extends Thread
     }
     
     protected IPipelineSpecificationWithVersions 
computePipelineSpecification(String documentIdentifierHash,
-      String componentIdentifierHash)
+      String componentIdentifierHash,
+      String documentIdentifier)
     {
-      return new 
PipelineSpecificationWithVersions(pipelineSpecification,previousDocuments.get(documentIdentifierHash),componentIdentifierHash);
+      QueuedDocument qd = previousDocuments.get(documentIdentifierHash);
+      if (qd == null)
+        throw new IllegalArgumentException("Unrecognized document identifier: 
'"+documentIdentifier+"'");
+      return new 
PipelineSpecificationWithVersions(pipelineSpecification,qd,componentIdentifierHash);
     }
 
   }