svn commit: r1629815 - in /jackrabbit/oak/branches/1.0: ./ oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTest.java

[mreutegg]

Author: mreutegg
Date: Tue Oct  7 07:17:03 2014
New Revision: 1629815

URL: http://svn.apache.org/r1629815
Log:
OAK-2166: CacheConsistencyTest may fail with IllegalStateException

Merge revision 1629814 from trunk

Modified:
    jackrabbit/oak/branches/1.0/   (props changed)
    
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTest.java

Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
  Merged /jackrabbit/oak/trunk:r1629814

Modified: 
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTest.java?rev=1629815&r1=1629814&r2=1629815&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTest.java
 (original)
+++ 
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTest.java
 Tue Oct  7 07:17:03 2014
@@ -50,7 +50,7 @@ public class CacheConsistencyTest extend
         DB db = mongoConnection.getDB();
         MongoUtils.dropCollections(db);
         DocumentMK.Builder builder = new DocumentMK.Builder()
-                .clock(getTestClock()).setAsyncDelay(0).setMongoDB(db);
+                .clock(getTestClock()).setAsyncDelay(0);
         store = new TestStore(db, builder);
         mk = builder.setDocumentStore(store).open();
     }