Author: kwright
Date: Thu Jan 29 16:58:32 2015
New Revision: 1655741
URL: http://svn.apache.org/r1655741
Log:
More CONNECTORS-1153 changes
Modified:
manifoldcf/branches/dev_1x/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java
Modified:
manifoldcf/branches/dev_1x/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java?rev=1655741&r1=1655740&r2=1655741&view=diff
==============================================================================
---
manifoldcf/branches/dev_1x/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java
(original)
+++
manifoldcf/branches/dev_1x/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java
Thu Jan 29 16:58:32 2015
@@ -2785,10 +2785,6 @@ public class IncrementalIngester extends
String oldParameterVersion =
fullSpec.getOutputParameterVersionString(i);
String oldOutputVersion = fullSpec.getOutputVersionString(i);
String oldTransformationVersion =
fullSpec.getOutputTransformationVersionString(i);
- // Backwards compatibility hack: If the oldTransformationVersion is
empty, use "0+0!" as the value.
- // That's what a job with no transformation connections would have as
a transformation version string today.
- if (oldTransformationVersion.length() == 0)
- oldTransformationVersion = "0+0!";
String oldAuthorityName = fullSpec.getAuthorityNameString(i);
// Compute the transformation version string. Must always be computed
if we're going to reindex, since we save it.
@@ -2804,6 +2800,10 @@ public class IncrementalIngester extends
}
if (needToReindex == false)
{
+ // Backwards compatibility hack: If the oldTransformationVersion is
empty, use "0+0!" as the value.
+ // That's what a job with no transformation connections would have
as a transformation version string today.
+ if (oldTransformationVersion == null ||
oldTransformationVersion.length() == 0)
+ oldTransformationVersion = "0+0!";
needToReindex =
(!oldTransformationVersion.equals(newTransformationVersion));
}