[lucene-solr] branch jira/solr-13350-new updated: SOLR-13350: Fixing query component for multi-threaded case

[is...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ishan pushed a commit to branch jira/solr-13350-new
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/jira/solr-13350-new by this push:
     new b1bfe2e  SOLR-13350: Fixing query component for multi-threaded case
b1bfe2e is described below

commit b1bfe2ef8028e6ab3ba224a23fc50e5643dabe90
Author: Ishan Chattopadhyaya <is...@apache.org>
AuthorDate: Tue Mar 3 11:56:19 2020 +0530

    SOLR-13350: Fixing query component for multi-threaded case
---
 .../core/src/java/org/apache/solr/handler/component/QueryComponent.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java b/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
index 5da1fac..67d6539 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
@@ -912,7 +912,7 @@ public class QueryComponent extends SearchComponent
         numFound += docs.getNumFound();
 
         NamedList sortFieldValues = (NamedList)(srsp.getSolrResponse().getResponse().get("sort_values"));
-        if (sortFieldValues.size()==0 && // we bypass merging this response only if it's partial itself
+        if (sortFieldValues == null || sortFieldValues.size()==0 && // we bypass merging this response only if it's partial itself
                             thisResponseIsPartial) { // but not the previous one!!
           continue; //fsv timeout yields empty sort_vlaues
         }