commit dda4578e1f2fd7cbd0f1ed3c95519437601b011f
author Sebastian Nagel <snagel@apache.org> Mon Aug 26 12:03:48 2019 +0200
committer GitHub <noreply@github.com> Mon Aug 26 12:03:48 2019 +0200
tree 584106d3b7d053f13e07f925b0dab603be12d765
parent f02c41a35f5bb6c13d3019e7f8adac177c29319b
parent 2408256784d1acc510a75f28b34c09204dc58928

Merge pull request #464 from deanpearce/bug/solr-cleanup

NUTCH-2731 Fix to ensure that credentials are set on delete operations.

src/plugin/indexer-solr/src/java/org/apache/nutch/indexwriter/solr/SolrIndexWriter.java

diff --git a/src/plugin/indexer-solr/src/java/org/apache/nutch/indexwriter/solr/SolrIndexWriter.java b/src/plugin/indexer-solr/src/java/org/apache/nutch/indexwriter/solr/SolrIndexWriter.java
index cc2e8d7..86ca3eb 100644
--- a/src/plugin/indexer-solr/src/java/org/apache/nutch/indexwriter/solr/SolrIndexWriter.java
+++ b/src/plugin/indexer-solr/src/java/org/apache/nutch/indexwriter/solr/SolrIndexWriter.java
@@ -257,9 +257,19 @@
         LOG.info(
             "SolrIndexer: deleting " + Integer.toString(deleteIds.size()) + "/"
                 + Integer.toString(totalDeletes) + " documents");
-        for (SolrClient solrClient : solrClients) {
-          solrClient.deleteById(deleteIds);
+        
+        UpdateRequest req = new UpdateRequest();
+        req.deleteById(deleteIds);
+        req.setAction(UpdateRequest.ACTION.OPTIMIZE, false, false);
+        req.setParams(params);
+        if (this.auth) {
+          req.setBasicAuthCredentials(this.username, this.password);
         }
+        
+        for (SolrClient solrClient : solrClients) {
+          solrClient.request(req);
+        }
+        
       } catch (final SolrServerException e) {
         LOG.error("Error deleting: " + deleteIds);
         throw makeIOException(e);