From 7717ac137f31798ca09391f9b1df700f33eef9b2 Mon Sep 17 00:00:00 2001
From: Megala <ktumegala@yahoo.com>
Date: Wed, 7 Dec 2016 15:29:32 +0530
Subject: [PATCH] Fixing bundle loading problem

---
 pom.xml                                              |  1 +
 .../execution/json/getPropertyFunctionExtension.java | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index b14a66967b..b1671cc446 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,6 +47,7 @@
         <dependency>
             <groupId>org.json.wso2</groupId>
             <artifactId>json</artifactId>
+            <version>${analytics.json.version}</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
diff --git a/src/main/java/org/wso2/extension/siddhi/execution/json/getPropertyFunctionExtension.java b/src/main/java/org/wso2/extension/siddhi/execution/json/getPropertyFunctionExtension.java
index 78c873a550..8f68577a60 100644
--- a/src/main/java/org/wso2/extension/siddhi/execution/json/getPropertyFunctionExtension.java
+++ b/src/main/java/org/wso2/extension/siddhi/execution/json/getPropertyFunctionExtension.java
@@ -18,6 +18,7 @@
 
 package org.wso2.extension.siddhi.execution.json;
 
+import org.json.JSONException;
 import org.json.JSONObject;
 import org.wso2.siddhi.core.config.ExecutionPlanContext;
 import org.wso2.siddhi.core.exception.ExecutionPlanRuntimeException;
@@ -68,10 +69,13 @@ public class getPropertyFunctionExtension extends FunctionExecutor {
         }
         String jsonString = (String) data[0];
         String property = (String) data[1];
-
-        JSONObject jsonObject = new JSONObject(jsonString);
-        Object value = jsonObject.get(property).toString();
-        return value;
+        JSONObject jsonObject = null;
+        try {
+            jsonObject = new JSONObject(jsonString);
+            return jsonObject.get(property).toString();
+        } catch (JSONException e) {
+            throw new ExecutionPlanRuntimeException("Cannot parse JSON String in json:getPeroperty() function. " + e);
+        }
     }
 
     @Override