From 1dcf5624895a5824bd9fa2ab15f8c24819fffd99 Mon Sep 17 00:00:00 2001
From: Jongyoul Lee <jongyoul@gmail.com>
Date: Tue, 5 Jul 2016 12:49:22 +0900
Subject: [PATCH] Fixed NPE when there's no properties field in
 interpreter-setting.json

---
 .../zeppelin/interpreter/InterpreterFactory.java   | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactory.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactory.java
index 47a4325a72e..a691628cb02 100644
--- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactory.java
+++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactory.java
@@ -212,8 +212,11 @@ public boolean accept(Path entry) throws IOException {
           if (null != infos) {
             Properties p = new Properties();
             for (RegisteredInterpreter info : infos) {
-              for (String key : info.getProperties().keySet()) {
-                p.put(key, info.getProperties().get(key).getValue());
+              Map<String, InterpreterProperty> interpreterProperties = info.getProperties();
+              if (null != interpreterProperties) {
+                for (String key : info.getProperties().keySet()) {
+                  p.put(key, info.getProperties().get(key).getValue());
+                }
               }
             }
             add(groupName, groupName, new LinkedList<Dependency>(), defaultOption, p);
@@ -224,8 +227,11 @@ public boolean accept(Path entry) throws IOException {
           List<RegisteredInterpreter> infos = groupClassNameMap.get(groupName);
           Properties p = new Properties();
           for (RegisteredInterpreter info : infos) {
-            for (String key : info.getProperties().keySet()) {
-              p.put(key, info.getProperties().get(key).getValue());
+            Map<String, InterpreterProperty> interpreterProperties = info.getProperties();
+            if (null != interpreterProperties) {
+              for (String key : info.getProperties().keySet()) {
+                p.put(key, info.getProperties().get(key).getValue());
+              }
             }
           }
           add(groupName, groupName, new LinkedList<Dependency>(), defaultOption, p);