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 2014/11/25 11:06:32 UTC
svn commit: r1641558 - in /manifoldcf/branches/dev_1x: ./ CHANGES.txt
framework/
framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java
Author: kwright
Date: Tue Nov 25 10:06:32 2014
New Revision: 1641558
URL: http://svn.apache.org/r1641558
Log:
Pull up fix for CONNECTORS-1114 from trunk
Modified:
manifoldcf/branches/dev_1x/ (props changed)
manifoldcf/branches/dev_1x/CHANGES.txt
manifoldcf/branches/dev_1x/framework/ (props changed)
manifoldcf/branches/dev_1x/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java
Propchange: manifoldcf/branches/dev_1x/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1641557
Modified: manifoldcf/branches/dev_1x/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/CHANGES.txt?rev=1641558&r1=1641557&r2=1641558&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/CHANGES.txt (original)
+++ manifoldcf/branches/dev_1x/CHANGES.txt Tue Nov 25 10:06:32 2014
@@ -3,6 +3,9 @@ $Id$
======================= 1.8-dev =====================
+CONNECTORS-1114: SQL exception calling removeDocument().
+(Markus Schuch, Karl Wright)
+
CONNECTORS-1063: Add section to how-to-build-and-deploy on
the Alfresco Webscript connector.
(Karl Wright, Maurizio Pillitu)
Propchange: manifoldcf/branches/dev_1x/framework/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk/framework:r1641557
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=1641558&r1=1641557&r2=1641558&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 Tue Nov 25 10:06:32 2014
@@ -1541,7 +1541,7 @@ public class IncrementalIngester extends
String query = buildConjunctionClause(list,new ClauseDescription[]{
new MultiClause(docKeyField,paramValues),
new UnitaryClause(outputConnNameField,outputConnectionName),
- new UnitaryClause(componentHashField,componentHash)});
+ (componentHash==null || componentHash.length() == 0)?new NullCheckClause(componentHashField,true):new UnitaryClause(componentHashField,componentHash)});
IResultSet set = performQuery("SELECT "+idField+" FROM "+
getTableName()+" WHERE "+query,list,null,null);