Merge pull request #1032 from couchbase/feature/issue_1030_listener_hange_state

Fixed #1030 - Requests to Listener in pending state

Author: zgramana

src/main/java/com/couchbase/lite/Manager.java

@@ -69,6 +69,7 @@ public final class Manager {
     public static final String SQLITE_STORAGE = "SQLite";
     public static final String FORESTDB_STORAGE = "ForestDB";
 
+    // NOTE: Jackson is thread-safe http://wiki.fasterxml.com/JacksonFAQThreadSafety
     private static final ObjectMapper mapper = new ObjectMapper();
 
     private ManagerOptions options;

src/main/java/com/couchbase/lite/router/Router.java

@@ -365,7 +365,7 @@ public void start() {
                     return;
                 } else {
                     boolean mustExist = false;
-                    db = manager.getDatabase(dbName, mustExist);
+                    db = manager.getDatabase(dbName, mustExist); // NOTE: synchronized
                     if (db == null) {
                         connection.setResponseCode(Status.BAD_REQUEST);
                         try {
@@ -548,10 +548,9 @@ public void start() {
             waiting = true;
         }
 
-        if (waiting) {
-            if (db != null) {
-                db.addDatabaseListener(this);
-            }
+        if (waiting && db != null) {
+            Log.v(Log.TAG_ROUTER, "waiting=true & db!=null: call Database.addDatabaseListener()");
+            db.addDatabaseListener(this);
         }
     }
 
@@ -692,6 +691,7 @@ public Status do_POST_replicate(Database _db, String _docID, String _attachmentN
         }
 
         try {
+            // NOTE: replicator instance is created per request. not access shared instances
             replicator = manager.getReplicator(body);
         } catch (CouchbaseLiteException e) {
             Map<String, Object> result = new HashMap<String, Object>();
@@ -978,6 +978,7 @@ public Status do_GET_Database(Database _db, String _docID, String _attachmentNam
         if (!status.isSuccessful()) {
             return status;
         }
+        // NOTE: all methods are read operation. not necessary to be synchronized
         int num_docs = db.getDocumentCount();
         long update_seq = db.getLastSequenceNumber();
         long instanceStartTimeMicroseconds = db.getStartTime() * 1000;
@@ -999,6 +1000,7 @@ public Status do_PUT_Database(Database _db, String _docID, String _attachmentNam
         }
 
         try {
+            // note: synchronized
             db.open();
         } catch (CouchbaseLiteException e) {
             return e.getCBLStatus();
@@ -1012,7 +1014,9 @@ public Status do_DELETE_Database(Database _db, String _docID, String _attachment
         if (getQuery("rev") != null) {
             return new Status(Status.BAD_REQUEST);  // CouchDB checks for this; probably meant to be a document deletion
         }
-        db.delete();
+        synchronized (db) {
+            db.delete();
+        }
         return new Status(Status.OK);
     }
 
@@ -1883,10 +1887,12 @@ private RevisionInternal update(Database _db, String docID, Body body, boolean d
 
         RevisionInternal result = null;
         try {
-            if (isLocalDoc) {
-                result = _db.getStore().putLocalRevision(rev, prevRevID, true);
-            } else {
-                result = _db.putRevision(rev, prevRevID, allowConflict);
+            synchronized (_db) {
+                if (isLocalDoc) {
+                    result = _db.getStore().putLocalRevision(rev, prevRevID, true);
+                } else {
+                    result = _db.putRevision(rev, prevRevID, allowConflict);
+                }
             }
             if (deleting) {
                 outStatus.setCode(Status.OK);
@@ -1922,8 +1928,6 @@ private Status update(Database _db, String docID, Body body, boolean deleting) {
             // On PUT/DELETE, get revision ID from either ?rev= query or doc body:
             String revParam = getQuery("rev");
 
-            // TODO: If-Match
-
             if (revParam != null && body != null) {
                 String revProp = (String) body.getProperties().get("_rev");
                 if (revProp == null) {
@@ -1989,7 +1993,10 @@ public Status do_DELETE_Document(Database _db, String docID, String _attachmentN
         return update(_db, docID, null, true);
     }
 
-    private Status updateAttachment(String attachment, String docID, InputStream contentStream) throws CouchbaseLiteException {
+    private Status updateAttachment(String attachment,
+                                    String docID,
+                                    InputStream contentStream)
+            throws CouchbaseLiteException {
         Status status = new Status(Status.OK);
         String revID = getQuery("rev");
         if (revID == null) {
@@ -2007,8 +2014,17 @@ private Status updateAttachment(String attachment, String docID, InputStream con
             throw new CouchbaseLiteException(e.getCause(), Status.BAD_ATTACHMENT);
         }
 
-        RevisionInternal rev = db.updateAttachment(attachment, body, connection.getRequestProperty("content-type"), AttachmentInternal.AttachmentEncoding.AttachmentEncodingNone,
-                docID, revID, null);
+        RevisionInternal rev;
+        synchronized (db) {
+            rev = db.updateAttachment(
+                    attachment,
+                    body,
+                    connection.getRequestProperty("content-type"),
+                    AttachmentInternal.AttachmentEncoding.AttachmentEncodingNone,
+                    docID,
+                    revID,
+                    null);
+        }
         Map<String, Object> resultDict = new HashMap<String, Object>();
         resultDict.put("ok", true);
         resultDict.put("id", rev.getDocID());
@@ -2021,11 +2037,13 @@ private Status updateAttachment(String attachment, String docID, InputStream con
         return status;
     }
 
-    public Status do_PUT_Attachment(Database _db, String docID, String _attachmentName) throws CouchbaseLiteException {
+    public Status do_PUT_Attachment(Database _db, String docID, String _attachmentName)
+            throws CouchbaseLiteException {
         return updateAttachment(_attachmentName, docID, connection.getRequestInputStream());
     }
 
-    public Status do_DELETE_Attachment(Database _db, String docID, String _attachmentName) throws CouchbaseLiteException {
+    public Status do_DELETE_Attachment(Database _db, String docID, String _attachmentName)
+            throws CouchbaseLiteException {
         return updateAttachment(_attachmentName, docID, null);
     }
 
@@ -2101,7 +2119,9 @@ private Status queryDesignDoc(String designDoc, String viewName, List<Object> ke
             options.setKeys(keys);
         }
 
-        view.updateIndex();
+        synchronized (db) {
+            view.updateIndex();
+        }
 
         long lastSequenceIndexed = view.getLastSequenceIndexed();