lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tflo...@apache.org
Subject [lucene-solr] branch master updated: SOLR-13281: Fix NPE in DocExpirationUpdateProcessor
Date Fri, 19 Apr 2019 05:23:09 GMT
This is an automated email from the ASF dual-hosted git repository.

tflobbe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/master by this push:
     new 9f644b1  SOLR-13281: Fix NPE in DocExpirationUpdateProcessor
9f644b1 is described below

commit 9f644b1c6911a68b7ed29d5992bc0bec66dec0ed
Author: Tomas Fernandez Lobbe <tflobbe@apache.org>
AuthorDate: Thu Apr 18 22:22:26 2019 -0700

    SOLR-13281: Fix NPE in DocExpirationUpdateProcessor
---
 solr/CHANGES.txt                                                        | 2 ++
 .../solr/update/processor/DocExpirationUpdateProcessorFactory.java      | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index ef46784..d08112c 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -217,6 +217,8 @@ Bug Fixes
 
 * SOLR-13408: Cannot start/stop DaemonStream repeatedly, other API improvements (Erick Erickson)
 
+* SOLR-13281: Fixed NPE in DocExpirationUpdateProcessorFactory (Munendra S N, Tomás Fernández
Löbbe)
+
 Improvements
 ----------------------
 
diff --git a/solr/core/src/java/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactory.java
b/solr/core/src/java/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactory.java
index 6eeb083..38f6c47 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactory.java
@@ -38,6 +38,7 @@ import org.apache.solr.common.cloud.Replica;
 import org.apache.solr.common.cloud.Slice;
 import org.apache.solr.common.util.ExecutorUtil;
 import org.apache.solr.common.util.NamedList;
+import org.apache.solr.common.util.SimpleOrderedMap;
 import org.apache.solr.core.CloseHook;
 import org.apache.solr.core.SolrCore;
 import org.apache.solr.request.LocalSolrQueryRequest;
@@ -384,6 +385,7 @@ public final class DocExpirationUpdateProcessorFactory
         (factory.core, Collections.<String,String[]>emptyMap());
       try {
         final SolrQueryResponse rsp = new SolrQueryResponse();
+        rsp.addResponseHeader(new SimpleOrderedMap<>(1));
         SolrRequestInfo.setRequestInfo(new SolrRequestInfo(req, rsp));
         try {
           


Mime
View raw message