You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2013/02/13 14:27:48 UTC
svn commit: r1445585 - in /manifoldcf/trunk: CHANGES.txt
framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java
Author: kwright
Date: Wed Feb 13 13:27:47 2013
New Revision: 1445585
URL: http://svn.apache.org/r1445585
Log:
Fix for CONNECTORS-645.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java
Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1445585&r1=1445584&r2=1445585&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Wed Feb 13 13:27:47 2013
@@ -3,6 +3,9 @@ $Id$
======================= 1.2-dev =====================
+CONNECTORS-645: Handle null data properly in worker thread.
+(Maciej Li¿ewski, Karl Wright)
+
CONNECTORS-644: Restart button did not work.
(Erlend Garåsen, Karl Wright)
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=1445585&r1=1445584&r2=1445585&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 Wed Feb 13 13:27:47 2013
@@ -1707,19 +1707,22 @@ public class WorkerThread extends Thread
String documentIdentifierHash = ManifoldCF.hash(documentIdentifier);
- Map<String,Set<String>> forcedMetadata = job.getForcedMetadata();
-
- // Modify the repository document with forced parameters.
- for (String paramName : forcedMetadata.keySet())
+ if (data != null)
{
- Set<String> values = forcedMetadata.get(paramName);
- String[] paramValues = new String[values.size()];
- int j = 0;
- for (String value : values)
+ Map<String,Set<String>> forcedMetadata = job.getForcedMetadata();
+
+ // Modify the repository document with forced parameters.
+ for (String paramName : forcedMetadata.keySet())
{
- paramValues[j++] = value;
+ Set<String> values = forcedMetadata.get(paramName);
+ String[] paramValues = new String[values.size()];
+ int j = 0;
+ for (String value : values)
+ {
+ paramValues[j++] = value;
+ }
+ data.addField(paramName,paramValues);
}
- data.addField(paramName,paramValues);
}
// First, we need to add into the metadata the stuff from the job description.