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 2015/01/28 17:18:58 UTC
svn commit: r1655380 - in /manifoldcf/branches/release-2.0-branch: ./
CHANGES.txt
framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java
Author: kwright
Date: Wed Jan 28 16:18:58 2015
New Revision: 1655380
URL: http://svn.apache.org/r1655380
Log:
Pull up case (3) fix from trunk for CONNECTORS-1153.
Modified:
manifoldcf/branches/release-2.0-branch/ (props changed)
manifoldcf/branches/release-2.0-branch/CHANGES.txt
manifoldcf/branches/release-2.0-branch/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java
Propchange: manifoldcf/branches/release-2.0-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 28 16:18:58 2015
@@ -119,4 +119,4 @@
/manifoldcf/branches/CONNECTORS-981:1605049-1605773
/manifoldcf/branches/CONNECTORS-989:1611600-1612101
/manifoldcf/branches/CONNECTORS-990:1610284-1610707
-/manifoldcf/trunk:1644252,1644399,1644538,1644920,1644931,1646317,1646397,1646403,1646640,1646947,1647574,1647577,1647608,1650351,1651921,1654651-1654652,1655205
+/manifoldcf/trunk:1644252,1644399,1644538,1644920,1644931,1646317,1646397,1646403,1646640,1646947,1647574,1647577,1647608,1650351,1651921,1654651-1654652,1655205,1655377-1655378
Modified: manifoldcf/branches/release-2.0-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-2.0-branch/CHANGES.txt?rev=1655380&r1=1655379&r2=1655380&view=diff
==============================================================================
--- manifoldcf/branches/release-2.0-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-2.0-branch/CHANGES.txt Wed Jan 28 16:18:58 2015
@@ -4,6 +4,10 @@ $Id$
======================= Release 2.0.1 =====================
+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/branches/release-2.0-branch/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-2.0-branch/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java?rev=1655380&r1=1655379&r2=1655380&view=diff
==============================================================================
--- manifoldcf/branches/release-2.0-branch/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java (original)
+++ manifoldcf/branches/release-2.0-branch/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java Wed Jan 28 16:18:58 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)
{