iOS/macOS @synchronized guard for sqlite3_open operation

bussmann-it · Jan 1, 2018 · 7572e38 · 7572e38
1 parent 9cc042f
commit 7572e38
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,7 +1,8 @@
 # Changes
 
-###### cordova-sqlite-legacy-express-core 1.0.5-pre02
+###### cordova-sqlite-legacy-express-core 1.0.5
 
+- iOS/macOS @synchronized guard for sqlite3_open operation
 - Signal INTERNAL ERROR in case of attempt to reuse db (Android/iOS) (should never happen due to workaround solution to BUG 666)
 
 ###### cordova-sqlite-legacy-express-core 1.0.4

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova-sqlite-legacy-express-core",
-  "version": "1.0.5-pre02",
+  "version": "1.0.5",
   "description": "Native interface to SQLite for PhoneGap/Cordova (legacy express core version)",
   "cordova": {
     "id": "cordova-sqlite-legacy-express-core",

diff --git a/plugin.xml b/plugin.xml
@@ -2,7 +2,7 @@
 <plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android"
     id="cordova-sqlite-legacy-express-core"
-    version="1.0.5-pre02">
+    version="1.0.5">
 
     <name>Cordova sqlite storage plugin - legacy express core version</name>
 

diff --git a/src/ios/SQLitePlugin.m b/src/ios/SQLitePlugin.m
@@ -128,7 +128,11 @@ -(void)openNow: (CDVInvokedUrlCommand*)command
             // NO LONGER EXPECTED due to BUG 666 workaround solution:
             NSLog(@"INTERNAL ERROR: database already open for db name: %@ (db file name: %@)", dbname, dbfilename);
             pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString: @"INTERNAL ERROR: database already open"];
-        } else {
+            [self.commandDelegate sendPluginResult:pluginResult callbackId: command.callbackId];
+            return;
+        }
+
+        @synchronized(self) {
             const char *name = [dbname UTF8String];
             sqlite3 *db;