1 files changed, 12 insertions, 8 deletions
diff --git a/server/src/main/java/org/onap/usecaseui/server/service/intent/impl/IntentInstanceServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/intent/impl/IntentInstanceServiceImpl.java
index 372a0c1b..bebc8121 100644
--- a/server/src/main/java/org/onap/usecaseui/server/service/intent/impl/IntentInstanceServiceImpl.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/intent/impl/IntentInstanceServiceImpl.java
@@ -778,14 +778,18 @@ public class IntentInstanceServiceImpl implements IntentInstanceService {
     }
 
     private IntentInstance assembleIntentInstanceFormSliceInfo(IntentInstance instance, Object body) {
-        JSONObject jsonObject = new JSONObject((Map) body);
-        JSONObject slicingOrderInfo = jsonObject.getJSONObject("slicing_order_info");
-        String intent_content = slicingOrderInfo.getString("intentContent");
-        slicingOrderInfo.remove("intentContent");
-        instance.setIntentConfig(slicingOrderInfo.toJSONString());
-        instance.setIntentContent(intent_content);
-        instance.setIntentName(slicingOrderInfo.getString("name"));
-        return instance;
+        if(body instanceof Map){
+            Map map = (Map) body;
+            JSONObject jsonObject = new JSONObject(map);
+            JSONObject slicingOrderInfo = jsonObject.getJSONObject("slicing_order_info");
+            String intent_content = slicingOrderInfo.getString("intentContent");
+            slicingOrderInfo.remove("intentContent");
+            instance.setIntentConfig(slicingOrderInfo.toJSONString());
+            instance.setIntentContent(intent_content);
+            instance.setIntentName(slicingOrderInfo.getString("name"));
+            return instance;
+        }
+        return new IntentInstance();
     }