[incubator-pinot] 01/01: Fix NPE while unparsing single key DSL output

[jf...@apache.org]

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

jfim pushed a commit to branch fix-npe-in-unparse
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git

commit c665a7f68ebed359dc88f020fd83324a5dfb265d
Author: Jean-Francois Im <je...@gmail.com>
AuthorDate: Thu Nov 15 12:03:57 2018 -0800

    Fix NPE while unparsing single key DSL output
    
    Fix NPE that can happen if unparsing of a single key DSL fails.
---
 .../src/main/java/com/linkedin/pinot/common/config/Serializer.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pinot-common/src/main/java/com/linkedin/pinot/common/config/Serializer.java b/pinot-common/src/main/java/com/linkedin/pinot/common/config/Serializer.java
index 44e030d..1d7e5db 100644
--- a/pinot-common/src/main/java/com/linkedin/pinot/common/config/Serializer.java
+++ b/pinot-common/src/main/java/com/linkedin/pinot/common/config/Serializer.java
@@ -120,7 +120,12 @@ public class Serializer {
         Class<?> dslValueType = dslClass.getMethod("parse", String.class).getReturnType();
         Object dslValueObject = Deserializer.deserialize(dslValueType, dslValueData, "");
         if (dslValueObject != null) {
-          return List.of(Tuple.of(configKey, dslInstance.unparse(dslValueObject)));
+          String unparsedValue = dslInstance.unparse(dslValueObject);
+          if (unparsedValue != null) {
+            return List.of(Tuple.of(configKey, unparsedValue));
+          } else {
+            return List.empty();
+          }
         } else {
           return List.empty();
         }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org