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/04/17 21:22:15 UTC
android commit: Adding fix for CB-482
Updated Branches:
refs/heads/master f2c38ea0a -> c341cf0d4
Updated Tags: refs/tags/1.6.1 [created] c341cf0d4
Adding fix for CB-482
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/c341cf0d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/c341cf0d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/c341cf0d
Branch: refs/heads/master
Commit: c341cf0d47c4c24e097985fe941adabfbd1e30b7
Parents: f2c38ea
Author: Joe Bowser <bo...@apache.org>
Authored: Tue Apr 17 12:20:23 2012 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Tue Apr 17 12:20:23 2012 -0700
----------------------------------------------------------------------
framework/assets/js/cordova.android.js | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/c341cf0d/framework/assets/js/cordova.android.js
----------------------------------------------------------------------
diff --git a/framework/assets/js/cordova.android.js b/framework/assets/js/cordova.android.js
index f0a811a..1b87916 100644
--- a/framework/assets/js/cordova.android.js
+++ b/framework/assets/js/cordova.android.js
@@ -1,6 +1,6 @@
-// commit 9451ff3c5517ba9ba4a2c062633686bb3a993f52
+// commit b2de4baa76a94ecb916619a536339ffee9ef6843
-// File generated at :: Thu Apr 12 2012 16:36:23 GMT-0700 (PDT)
+// File generated at :: Tue Apr 17 2012 12:19:35 GMT-0700 (PDT)
/*
Licensed to the Apache Software Foundation (ASF) under one
@@ -1005,7 +1005,11 @@ module.exports = {
db = originalOpenDatabase(name, version, desc, size);
}
catch (ex) {
- db = null;
+ if (ex.code === 18) {
+ db = null;
+ } else {
+ throw ex;
+ }
}
if (db === null) {