From d0b3ebe4eb9220c645ebc8a9d24cbde57c17e7a1 Mon Sep 17 00:00:00 2001
From: Luciano Resende <lresende@apache.org>
Date: Sun, 28 Aug 2016 16:41:31 -0700
Subject: [PATCH] [ZEPPELIN-1171] Only retrieve resources if client is set

Avoid NPE when retrieving resources by checking if client is
properly set.
---
 .../apache/zeppelin/resource/ResourcePoolUtils.java    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/ResourcePoolUtils.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/ResourcePoolUtils.java
index 9878d7e766c..30b2a929e6e 100644
--- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/ResourcePoolUtils.java
+++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/resource/ResourcePoolUtils.java
@@ -55,10 +55,12 @@ public static ResourceSet getAllResourcesExcept(String interpreterGroupExcludsio
         boolean broken = false;
         try {
           client = remoteInterpreterProcess.getClient();
-          List<String> resourceList = client.resourcePoolGetAll();
-          Gson gson = new Gson();
-          for (String res : resourceList) {
-            resourceSet.add(gson.fromJson(res, Resource.class));
+          if (client != null) {
+            List<String> resourceList = client.resourcePoolGetAll();
+            Gson gson = new Gson();
+            for (String res : resourceList) {
+              resourceSet.add(gson.fromJson(res, Resource.class));
+            }
           }
         } catch (Exception e) {
           logger.error(e.getMessage(), e);