You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2012/06/07 22:20:54 UTC

[12/50] [abbrv] android commit: Weird merge error. Yo dawg, I heard you like catching exceptions, so we put a catch around your catch. FAIL

Weird merge error. Yo dawg, I heard you like catching exceptions, so we put a catch around your catch. FAIL


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/4ecbaa79
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/4ecbaa79
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/4ecbaa79

Branch: refs/heads/master
Commit: 4ecbaa79cffc05d24a77e6a7e84d11a052806463
Parents: e7411e8
Author: Joe Bowser <bo...@apache.org>
Authored: Thu May 31 14:24:45 2012 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Thu May 31 14:24:45 2012 -0700

----------------------------------------------------------------------
 .../org/apache/cordova/ContactAccessorSdk5.java    |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/4ecbaa79/framework/src/org/apache/cordova/ContactAccessorSdk5.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/ContactAccessorSdk5.java b/framework/src/org/apache/cordova/ContactAccessorSdk5.java
index 51eeda5..0f41814 100644
--- a/framework/src/org/apache/cordova/ContactAccessorSdk5.java
+++ b/framework/src/org/apache/cordova/ContactAccessorSdk5.java
@@ -447,12 +447,7 @@ public class ContactAccessorSdk5 extends ContactAccessor {
         }
         return contact;
     }
-    catch (JSONException e) {
-        Log.e(LOG_TAG,e.getMessage(),e);
-    }
-    return contact;
-  }
-
+    
   /**
    * Take the search criteria passed into the method and create a SQL WHERE clause.
    * @param fields the properties to search against