Added exception handling to the json-rpc server

git-svn-id: http://goodold.googlecode.com/svn/drupal_modules/jsonrpc_server/trunk@180 b8d441e5-9555-0410-8e75-7fea32d02d5f
voxpelli · Sep 15, 2008 · 36cf8b5 · 36cf8b5
1 parent 6486d7f
commit 36cf8b5
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/JsonRpcServer.php b/JsonRpcServer.php
@@ -140,13 +140,18 @@ public function handle() {
     }
 
     //Call service method
-    $result = services_method_call($this->method['#method'], $this->args);
-    if (is_array($result) && isset($result['#error']) && $result['#error'] === TRUE) {
-      return $this->error(JSONRPC_ERROR_INTERNAL_ERROR, $result['#message']);
-    }
-    else {
-      return $this->result($result);
+    try {
+      $result = services_method_call($this->method['#method'], $this->args);
+      if (is_array($result) && isset($result['#error']) && $result['#error'] === TRUE) {
+        return $this->error(JSONRPC_ERROR_INTERNAL_ERROR, $result['#message']);
+      }
+      else {
+        return $this->result($result);
+      }
+    } catch (Exception $e) {
+      return $this->error(JSONRPC_ERROR_INTERNAL_ERROR, $e->getMessage());
     }
+
   }
 
   private function array_is_assoc(&$arr) {