Author: kwright
Date: Wed Jan 28 18:00:42 2015
New Revision: 1655416
URL: http://svn.apache.org/r1655416
Log:
Pull up fix for case (2) of CONNECTORS-1153.
Modified:
manifoldcf/branches/release-2.0-branch/ (props changed)
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 18:00:42 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,1655377-1655378
+/manifoldcf/trunk:1644252,1644399,1644538,1644920,1644931,1646317,1646397,1646403,1646640,1646947,1647574,1647577,1647608,1650351,1651921,1654651-1654652,1655205,1655377-1655378,1655411
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=1655416&r1=1655415&r2=1655416&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 18:00:42 2015
@@ -2747,7 +2747,7 @@ public class IncrementalIngester extends
if (needToReindex == false)
{
needToReindex = (!oldDocumentVersion.equals(newDocumentVersion) ||
-
!oldOutputVersion.equals(fullSpec.getStageDescriptionString(outputStage)) ||
+
!oldOutputVersion.equals(fullSpec.getStageDescriptionString(outputStage).getVersionString())
||
!oldAuthorityName.equals((newAuthorityNameString==null)?"":newAuthorityNameString));
}
if (needToReindex == false)
