commit 4d403abad0a97a0e0bf338cbd943948e1d5c29e7
author Ishan Chattopadhyaya <ishan@apache.org> Wed Apr 29 00:36:51 2020 +0530
committer Ishan Chattopadhyaya <ishan@apache.org> Wed Apr 29 00:36:51 2020 +0530
tree 8e51019a7cfaa4e36de3f60973ccddecb2633ccc
parent f9638c45f1242e4a0433a449b143503fc8c20e79

SOLR-14381: Handling a potential NPE

solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/SearchGroupsResultTransformer.java

diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/SearchGroupsResultTransformer.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/SearchGroupsResultTransformer.java
index 6ca58ce..bacacac 100644
--- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/SearchGroupsResultTransformer.java
+++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/SearchGroupsResultTransformer.java
@@ -111,7 +111,7 @@
         }
       }
 
-      final Long groupCount = (Long) topGroupsAndGroupCount.get(GROUP_COUNT);
+      final Long groupCount = topGroupsAndGroupCount.get(GROUP_COUNT)==null? null: ((Number) topGroupsAndGroupCount.get(GROUP_COUNT)).longValue();
       result.put(command.getKey(), new SearchGroupsFieldCommandResult(groupCount, searchGroups));
     }
     return result;