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

[mreutegg]

Author: mreutegg
Date: Thu Jun 22 12:20:35 2017
New Revision: 1799571

URL: http://svn.apache.org/viewvc?rev=1799571&view=rev
Log:
OAK-6383: Changes visible before merge

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.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=1799571&r1=1799570&r2=1799571&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 Jun 22 12:20:35 2017
@@ -2335,7 +2335,7 @@ public final class DocumentNodeStore
     }
 
     private void maybeRefreshHeadRevision() {
-        if (isDisposed.get()) {
+        if (isDisposed.get() || isDisableBranches()) {
             return;
         }
         // check if local head revision is outdated and needs an update

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java?rev=1799571&r1=1799570&r2=1799571&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
 Thu Jun 22 12:20:35 2017
@@ -3116,7 +3116,6 @@ public class DocumentNodeStoreTest {
     }
 
     // OAK-6383
-    @Ignore("OAK-6383")
     @Test
     public void disableBranches() throws Exception {
         Clock clock = new Clock.Virtual();