svn commit: r1791542 - in /manifoldcf/trunk: ./ connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/

[kwright]

Author: kwright
Date: Sat Apr 15 20:03:42 2017
New Revision: 1791542

URL: http://svn.apache.org/viewvc?rev=1791542&view=rev
Log:
Fix for CONNECTORS-1408.

Modified:
    manifoldcf/trunk/CHANGES.txt
    
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
    
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrClient.java

Modified: manifoldcf/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1791542&r1=1791541&r2=1791542&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Sat Apr 15 20:03:42 2017
@@ -6,6 +6,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/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java?rev=1791542&r1=1791541&r2=1791542&view=diff
==============================================================================
--- 
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
 (original)
+++ 
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
 Sat Apr 15 20:03:42 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/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrClient.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrClient.java?rev=1791542&r1=1791541&r2=1791542&view=diff
==============================================================================
--- 
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrClient.java
 (original)
+++ 
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrClient.java
 Sat Apr 15 20:03:42 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);