| commit | e2c881c49a0b2723bd7df396f986c102fb07467a | [log] [tgz] |
|---|---|---|
| author | Karl Wright <kwright@apache.org> | Wed Sep 19 22:08:10 2018 +0000 |
| committer | Karl Wright <kwright@apache.org> | Wed Sep 19 22:08:10 2018 +0000 |
| tree | a3a2b93276db21159dee827e3cc9eec20e620d10 | |
| parent | 3a888b588f2452a5f0cc3ef1001d44e2eb22f11a [diff] |
Pull up solr delete fix from trunk git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/branches/release-2.11-branch@1841398 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrClient.java b/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrClient.java index 604ef6a..cc188a6 100644 --- a/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrClient.java +++ b/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrClient.java
@@ -106,7 +106,8 @@ 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;