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 2017/04/15 20:04:55 UTC
svn commit: r1791543 - in /manifoldcf/branches/release-2.7-branch: ./
connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/
Author: kwright
Date: Sat Apr 15 20:04:55 2017
New Revision: 1791543
URL: http://svn.apache.org/viewvc?rev=1791543&view=rev
Log:
Pull up fix for CONNECTORS-1408 from trunk.
Modified:
manifoldcf/branches/release-2.7-branch/ (props changed)
manifoldcf/branches/release-2.7-branch/CHANGES.txt
manifoldcf/branches/release-2.7-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
manifoldcf/branches/release-2.7-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrClient.java
Propchange: manifoldcf/branches/release-2.7-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 15 20:04:55 2017
@@ -142,3 +142,4 @@
/manifoldcf/branches/CONNECTORS-981:1605049-1605773
/manifoldcf/branches/CONNECTORS-989:1611600-1612101
/manifoldcf/branches/CONNECTORS-990:1610284-1610707
+/manifoldcf/trunk:1791542
Modified: manifoldcf/branches/release-2.7-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-2.7-branch/CHANGES.txt?rev=1791543&r1=1791542&r2=1791543&view=diff
==============================================================================
--- manifoldcf/branches/release-2.7-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-2.7-branch/CHANGES.txt Sat Apr 15 20:04:55 2017
@@ -3,6 +3,10 @@ $Id$
======================= Release 2.7 =====================
+CONNECTORS-1408: Insure that there's a non-null document name in
+the Solr connector, otherwise there will be no multipart post.
+(Cihad Gozel, Karl Wright)
+
CONNECTORS-1409: Fix re-processing email bug.
(Furkan KAMACI)
Modified: manifoldcf/branches/release-2.7-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-2.7-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java?rev=1791543&r1=1791542&r2=1791543&view=diff
==============================================================================
--- manifoldcf/branches/release-2.7-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java (original)
+++ manifoldcf/branches/release-2.7-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java Sat Apr 15 20:04:55 2017
@@ -903,7 +903,7 @@ public class HttpPoster
ContentStreamUpdateRequest contentStreamUpdateRequest = new ContentStreamUpdateRequest(postUpdateAction);
if ( useExtractUpdateHandler )
{
- buildExtractUpdateHandlerRequest( length, is, contentType, contentName,
+ buildExtractUpdateHandlerRequest( length, is, contentType, (contentName==null || contentName.length()==0)?"docname":contentName,
contentStreamUpdateRequest );
}
else
Modified: manifoldcf/branches/release-2.7-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrClient.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-2.7-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrClient.java?rev=1791543&r1=1791542&r2=1791543&view=diff
==============================================================================
--- manifoldcf/branches/release-2.7-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrClient.java (original)
+++ manifoldcf/branches/release-2.7-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrClient.java Sat Apr 15 20:04:55 2017
@@ -95,7 +95,7 @@ public class ModifiedHttpSolrClient exte
private final HttpClient httpClient;
- private boolean useMultiPartPost = true;
+ private final boolean useMultiPartPost = true;
public ModifiedHttpSolrClient(String baseURL, HttpClient client, ResponseParser parser) {
super(baseURL, client, parser);