[lucene-solr] branch jira/solr-14470 updated: SOLR-14470: Fix NPE in StringFieldWriter

[jb...@apache.org]

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

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


The following commit(s) were added to refs/heads/jira/solr-14470 by this push:
     new 4608069  SOLR-14470: Fix NPE in StringFieldWriter
4608069 is described below

commit 46080695744e57626c2c3a0891a95e64177ca02b
Author: Joel Bernstein <jb...@apache.org>
AuthorDate: Fri May 22 09:41:54 2020 -0400

    SOLR-14470: Fix NPE in StringFieldWriter
---
 .../org/apache/solr/handler/export/StringFieldWriter.java   | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/handler/export/StringFieldWriter.java b/solr/core/src/java/org/apache/solr/handler/export/StringFieldWriter.java
index 0d7088e..6d5e34c 100644
--- a/solr/core/src/java/org/apache/solr/handler/export/StringFieldWriter.java
+++ b/solr/core/src/java/org/apache/solr/handler/export/StringFieldWriter.java
@@ -72,14 +72,21 @@ class StringFieldWriter extends FieldWriter {
     if (ew instanceof JavaBinCodec.BinEntryWriter) {
       ew.put(this.field, utf8.reset(ref.bytes, ref.offset, ref.length, null));
     } else {
-      String v = ((StringValue)sortValue).getLastString();
-      if(v == null) {
+      String v = null;
+      if(sortValue != null) {
+        v = ((StringValue) sortValue).getLastString();
+        if(v == null) {
+          fieldType.indexedToReadable(ref, cref);
+          v = cref.toString();
+          ((StringValue) sortValue).setLastString(v);
+        }
+      } else {
         fieldType.indexedToReadable(ref, cref);
         v = cref.toString();
-        ((StringValue) sortValue).setLastString(v);
       }
 
       ew.put(this.field, v);
+      
     }
     return true;
   }