svn commit: r1625450 - in /manifoldcf/branches/release-1.7-branch: ./ CHANGES.txt framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java

[kwright]

Author: kwright
Date: Wed Sep 17 01:24:20 2014
New Revision: 1625450

URL: http://svn.apache.org/r1625450
Log:
Pull up fix for CONNECTORS-1024 from dev_1x

Modified:
    manifoldcf/branches/release-1.7-branch/   (props changed)
    manifoldcf/branches/release-1.7-branch/CHANGES.txt
    
manifoldcf/branches/release-1.7-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java

Propchange: manifoldcf/branches/release-1.7-branch/
------------------------------------------------------------------------------
  Merged /manifoldcf/branches/dev_1x:r1623252
  Merged /manifoldcf/trunk:r1623251

Modified: manifoldcf/branches/release-1.7-branch/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.7-branch/CHANGES.txt?rev=1625450&r1=1625449&r2=1625450&view=diff
==============================================================================
--- manifoldcf/branches/release-1.7-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.7-branch/CHANGES.txt Wed Sep 17 01:24:20 2014
@@ -4,14 +4,18 @@ $Id$
 
 ======================= Release 1.7.1 =====================
 
-CONNECTORS-1023: Fix Alfresco tests.  They don't yet succeed, but
-at least they run, and the connector can communicate with Alfresco.
-(Karl Wright)
-
 CONNECTORS-1031: Fix Zookeeper synchronization to be resilient
 against short tick time settings.
 (Karl Wright)
 
+CONNECTORS-1024: Non-null components always failed due to a
+null pointer exception.
+(Karl Wright)
+
+CONNECTORS-1023: Fix Alfresco tests.  They don't yet succeed, but
+at least they run, and the connector can communicate with Alfresco.
+(Karl Wright)
+
 CONNECTORS-1020: Email connector misuse of variable names.
 (Karl Wright, Paul Boichat)
 

Modified: 
manifoldcf/branches/release-1.7-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.7-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java?rev=1625450&r1=1625449&r2=1625450&view=diff
==============================================================================
--- 
manifoldcf/branches/release-1.7-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java
 (original)
+++ 
manifoldcf/branches/release-1.7-branch/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/WorkerThread.java
 Wed Sep 17 01:24:20 2014
@@ -2114,7 +2114,7 @@ public class WorkerThread extends Thread
     protected void checkMultipleDispositions(String documentIdentifier, String 
componentIdentifier, String componentIdentifierHash)
     {
       if (abortSet.contains(documentIdentifier))
-        throw new IllegalStateException("Multiple document dispositions not 
allowed: Abort cannot be combiend with component disposition; document 
'"+documentIdentifier+"'");
+        throw new IllegalStateException("Multiple document dispositions not 
allowed: Abort cannot be combined with component disposition; document 
'"+documentIdentifier+"'");
       if (documentDeletedSet.contains(documentIdentifier))
         throw new IllegalStateException("Multiple document dispositions not 
allowed: Document delete cannot be combined with component disposition; 
document '"+documentIdentifier+"'");
       if (componentIdentifierHash == null)
@@ -2126,7 +2126,7 @@ public class WorkerThread extends Thread
       else
       {
         Set<String> components = touchedComponentSet.get(documentIdentifier);
-        if (components.contains(componentIdentifierHash))
+        if (components != null && components.contains(componentIdentifierHash))
           throw new IllegalStateException("Multiple document component 
dispositions not allowed: document '"+documentIdentifier+"', component 
'"+componentIdentifier+"'");
       }
     }