svn commit: r1582316 - in /jackrabbit/oak/trunk: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentAddNodesClusterIT.java

[mreutegg]

Author: mreutegg
Date: Thu Mar 27 14:18:04 2014
New Revision: 1582316

URL: http://svn.apache.org/r1582316
Log:
OAK-1579: ConcurrentAddNodesClusterIT.addNodes2() fails on travis

Synchronize runBackgroundOperations() method to avoid concurrent calls from 
dispose() and background thread.

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
    
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentAddNodesClusterIT.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1582316&r1=1582315&r2=1582316&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
 Thu Mar 27 14:18:04 2014
@@ -1275,7 +1275,7 @@ public final class DocumentNodeStore
 
     //----------------------< background operations 
>---------------------------
 
-    public void runBackgroundOperations() {
+    public synchronized void runBackgroundOperations() {
         if (isDisposed.get()) {
             return;
         }

Modified: 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentAddNodesClusterIT.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentAddNodesClusterIT.java?rev=1582316&r1=1582315&r2=1582316&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentAddNodesClusterIT.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentAddNodesClusterIT.java
 Thu Mar 27 14:18:04 2014
@@ -294,9 +294,11 @@ public class ConcurrentAddNodesClusterIT
         DocumentMK mk = new DocumentMK.Builder()
                 .setMongoDB(con.getDB())
                 .setClusterId(1).open();
-        Session session = new Jcr(mk.getNodeStore()).createRepository().login(
+        Repository repository = new Jcr(mk.getNodeStore()).createRepository();
+        Session session = repository.login(
                 new SimpleCredentials("admin", "admin".toCharArray()));
         session.logout();
+        dispose(repository);
         mk.dispose(); // closes connection as well
     }