You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by tf...@apache.org on 2019/04/19 05:25:59 UTC
[lucene-solr] branch branch_7_7 updated: SOLR-13281: Fix NPE in
DocExpirationUpdateProcessor
This is an automated email from the ASF dual-hosted git repository.
tflobbe pushed a commit to branch branch_7_7
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/branch_7_7 by this push:
new 59bff36 SOLR-13281: Fix NPE in DocExpirationUpdateProcessor
59bff36 is described below
commit 59bff3639e29c9ce395e58a96c91d48fd7fc6f25
Author: Tomas Fernandez Lobbe <tf...@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 a754c1b..44c7a34 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -71,6 +71,8 @@ Bug fixes
* SOLR-12371: Editing authorization config via REST API now works in standalone mode (janhoy)
+* SOLR-13281: Fixed NPE in DocExpirationUpdateProcessorFactory (Munendra S N, Tomás Fernández Löbbe)
+
================== 7.7.1 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
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 {