svn commit: r1364938 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel: KernelNodeStore.java KernelNodeStoreBranch.java

[angela]

Author: angela
Date: Tue Jul 24 08:57:37 2012
New Revision: 1364938

URL: http://svn.apache.org/viewvc?rev=1364938&view=rev
Log:
OAK-199 : KernelNodeStore defines 2 access methods for the CommitEditor

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStore.java
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStoreBranch.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStore.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStore.java?rev=1364938&r1=1364937&r2=1364938&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStore.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStore.java
 Tue Jul 24 08:57:37 2012
@@ -62,6 +62,7 @@ public class KernelNodeStore implements 
         this.root = new KernelNodeState(kernel, "/", kernel.getHeadRevision());
     }
 
+    @Nonnull
     public CommitEditor getEditor() {
         return editor;
     }
@@ -71,6 +72,7 @@ public class KernelNodeStore implements 
         this.editor = editor;
     }
 
+    @Nonnull
     public Observer getObserver() {
         return observer;
     }
@@ -80,7 +82,7 @@ public class KernelNodeStore implements 
         this.observer = observer;
     }
 
-    //-----------------------------------------------------------< NodeStore >
+    //----------------------------------------------------------< NodeStore 
>---
 
     @Override
     public synchronized NodeState getRoot() {
@@ -108,16 +110,11 @@ public class KernelNodeStore implements 
         return new CoreValueFactoryImpl(kernel);
     }
 
-    //------------------------------------------------------------< internal 
>---
+    //-----------------------------------------------------------< internal 
>---
 
     @Nonnull
     MicroKernel getKernel() {
         return kernel;
     }
 
-    @Nonnull
-    CommitEditor getCommitEditor() {
-        return editor;
-    }
-
 }

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStoreBranch.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStoreBranch.java?rev=1364938&r1=1364937&r2=1364938&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStoreBranch.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStoreBranch.java
 Tue Jul 24 08:57:37 2012
@@ -127,7 +127,7 @@ class KernelNodeStoreBranch implements N
     @Override
     public KernelNodeState merge() throws CommitFailedException {
         MicroKernel kernel = store.getKernel();
-        CommitEditor editor = store.getCommitEditor();
+        CommitEditor editor = store.getEditor();
 
         NodeState oldRoot = store.getRoot();
         NodeState toCommit = editor.editCommit(store, oldRoot, currentRoot);