From 83058a9a34529aca6133a36a878c52201ce14fb5 Mon Sep 17 00:00:00 2001
From: John Zhao <yunjzhao@ebay.com>
Date: Wed, 2 Mar 2016 14:51:58 -0800
Subject: [PATCH] KYLIN-1464 prevent NullPointerException when CubeDesc init
 failed due to IllegalStateException

---
 core-cube/src/main/java/org/apache/kylin/cube/CubeInstance.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/core-cube/src/main/java/org/apache/kylin/cube/CubeInstance.java b/core-cube/src/main/java/org/apache/kylin/cube/CubeInstance.java
index 2862d4f..d89e736 100644
--- a/core-cube/src/main/java/org/apache/kylin/cube/CubeInstance.java
+++ b/core-cube/src/main/java/org/apache/kylin/cube/CubeInstance.java
@@ -125,7 +125,12 @@ public class CubeInstance extends RootPersistentEntity implements IRealization,
 
     @Override
     public DataModelDesc getDataModelDesc() {
-        return this.getDescriptor().getModel();
+        CubeDesc cubeDesc = this.getDescriptor();
+        if (cubeDesc != null) {
+            return cubeDesc.getModel();
+        } else {
+            return null;
+        }
     }
 
     public boolean isReady() {
-- 
2.5.4 (Apple Git-61)