Possible workaroud for problem reported in #193

storesafe · Mar 1, 2015 · c33608e · c33608e
1 parent 31dca30
commit c33608e
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/android/org/pgsqlite/SQLitePlugin.java b/src/android/org/pgsqlite/SQLitePlugin.java
@@ -224,7 +224,7 @@ private SQLiteDatabase openDatabase(String dbname, boolean createFromAssets, Cal
         try {
             if (this.getDatabase(dbname) != null) {
                 // this should not happen - should be blocked at the execute("open") level
-                cbc.error("database already open");
+                if (cbc != null) cbc.error("database already open");
                 throw new Exception("database already open");
             }
 
@@ -240,11 +240,11 @@ private SQLiteDatabase openDatabase(String dbname, boolean createFromAssets, Cal
 
             SQLiteDatabase mydb = SQLiteDatabase.openOrCreateDatabase(dbfile, null);
 
-            cbc.success();
+            if (cbc != null) cbc.success();
 
             return mydb;
         } catch (SQLiteException e) {
-            cbc.error("can't open database " + e);
+            if (cbc != null) cbc.error("can't open database " + e);
             throw e;
         }
     }
@@ -848,6 +848,14 @@ public void run() {
                 while (!dbq.stop) {
                     executeSqlBatch(dbname, dbq.queries, dbq.jsonparams, dbq.queryIDs, dbq.cbc);
 
+                    // workaround:
+                    if (dbq.queries.length == 1 && dbq.queries[0] == "COMMIT") {
+                        Log.e(SQLitePlugin.class.getSimpleName(), "close and reopen db");
+                        closeDatabaseNow(dbname);
+                        this.mydb = openDatabase(dbname, false, null);
+                        Log.e(SQLitePlugin.class.getSimpleName(), "close and reopen db finished");
+                    }
+
                     dbq = q.take();
                 }
             } catch (Exception e) {