[incubator-pinot] branch master updated: Fix NPE while unparsing single key DSL output (#3501)

[jfim]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new ed1e0c0  Fix NPE while unparsing single key DSL output (#3501)
ed1e0c0 is described below

commit ed1e0c0ed6d9a6328c07bd49cad2272ebe8ca9cc
Author: Jean-François Im <jeanfrancois...@gmail.com>
AuthorDate: Tue Dec 4 12:39:16 2018 -0800

    Fix NPE while unparsing single key DSL output (#3501)
    
    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 2f66a23..9ca3fde 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
@@ -131,7 +131,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-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org