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/12/12 16:01:45 UTC
svn commit: r1644920 - in /manifoldcf/trunk: ./
connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/
Author: kwright
Date: Fri Dec 12 15:01:45 2014
New Revision: 1644920
URL: http://svn.apache.org/r1644920
Log:
Fix for CONNECTORS-1120.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnection.java
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchDelete.java
Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1644920&r1=1644919&r2=1644920&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Fri Dec 12 15:01:45 2014
@@ -6,6 +6,10 @@ $Id$
======================= Release 2.0 =====================
+CONNECTORS-1120: ElasticSearch: Handle case of deleting already
+deleted document.
+(Kamil Żyta, Karl Wright)
+
CONNECTORS-1118: Change IIncrementalIngester interface to allow
for cached connection instances.
(Aeham Abushwashi, Karl Wright)
Modified: manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnection.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnection.java?rev=1644920&r1=1644919&r2=1644920&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnection.java (original)
+++ manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnection.java Fri Dec 12 15:01:45 2014
@@ -224,7 +224,7 @@ public class ElasticSearchConnection
}
}
- private boolean handleResultCode(int code, String response)
+ protected boolean handleResultCode(int code, String response)
throws ManifoldCFException, ServiceInterruption
{
if (code == 200 || code == 201)
Modified: manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchDelete.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchDelete.java?rev=1644920&r1=1644919&r2=1644920&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchDelete.java (original)
+++ manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchDelete.java Fri Dec 12 15:01:45 2014
@@ -52,4 +52,17 @@ public class ElasticSearchDelete extends
setResult("JSONERROR",Result.ERROR, error);
Logging.connectors.warn("ES: Delete failed: "+getResponse());
}
+
+ @Override
+ protected boolean handleResultCode(int code, String response)
+ throws ManifoldCFException, ServiceInterruption
+ {
+ if (code == 404)
+ {
+ setResult("OK",Result.OK, null);
+ return true;
+ }
+ return super.handleResultCode(code, response);
+ }
+
}