svn commit: r1841398 - in /manifoldcf/branches/release-2.11-branch: ./ connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrClient.java

[kwright]

Author: kwright
Date: Wed Sep 19 22:08:10 2018
New Revision: 1841398

URL: http://svn.apache.org/viewvc?rev=1841398&view=rev
Log:
Pull up solr delete fix from trunk

Modified:
    manifoldcf/branches/release-2.11-branch/   (props changed)
    
manifoldcf/branches/release-2.11-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrClient.java

Propchange: manifoldcf/branches/release-2.11-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 19 22:08:10 2018
@@ -152,3 +152,4 @@
 /manifoldcf/branches/CONNECTORS-981:1605049-1605773
 /manifoldcf/branches/CONNECTORS-989:1611600-1612101
 /manifoldcf/branches/CONNECTORS-990:1610284-1610707
+/manifoldcf/trunk:1841397

Modified: 
manifoldcf/branches/release-2.11-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.11-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrClient.java?rev=1841398&r1=1841397&r2=1841398&view=diff
==============================================================================
--- 
manifoldcf/branches/release-2.11-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrClient.java
 (original)
+++ 
manifoldcf/branches/release-2.11-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrClient.java
 Wed Sep 19 22:08:10 2018
@@ -106,7 +106,8 @@ public class ModifiedHttpSolrClient exte
   protected HttpRequestBase createMethod(final SolrRequest request, String 
collection) throws IOException, SolrServerException {
     
     SolrParams params = request.getParams();
-    Collection<ContentStream> streams = 
requestWriter.getContentStreams(request);
+    RequestWriter.ContentWriter contentWriter = 
requestWriter.getContentWriter(request);
+    Collection<ContentStream> streams = contentWriter == null ? 
requestWriter.getContentStreams(request) : null;
     String path = requestWriter.getPath(request);
     if (path == null || !path.startsWith("/")) {
       path = DEFAULT_PATH;