Author: kwright
Date: Wed Jan 28 16:15:50 2015
New Revision: 1655377
URL: http://svn.apache.org/r1655377
Log:
Fix case (3) of CONNECTORS-1153
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1655377&r1=1655376&r2=1655377&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Wed Jan 28 16:15:50 2015
@@ -3,6 +3,10 @@ $Id$
======================= 2.1-dev =====================
+CONNECTORS-1153: Broken authority name comparison is preventing
+incremental when no authority is used.
+(Aeham Abushwashi, Karl Wright)
+
CONNECTORS-1151: FileNet connector completely broken, due to
MCF 1.8 reorganization.
(Guy Sperry, Karl Wright)
Modified:
manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java?rev=1655377&r1=1655376&r2=1655377&view=diff
==============================================================================
---
manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java
(original)
+++
manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java
Wed Jan 28 16:15:50 2015
@@ -2748,7 +2748,7 @@ public class IncrementalIngester extends
{
needToReindex = (!oldDocumentVersion.equals(newDocumentVersion) ||
!oldOutputVersion.equals(fullSpec.getStageDescriptionString(outputStage)) ||
- !oldAuthorityName.equals(newAuthorityNameString));
+
!oldAuthorityName.equals((newAuthorityNameString==null)?"":newAuthorityNameString));
}
if (needToReindex == false)
{
