You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by md...@apache.org on 2012/04/24 17:26:59 UTC
svn commit: r1329785 -
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelRoot.java
Author: mduerig
Date: Tue Apr 24 15:26:59 2012
New Revision: 1329785
URL: http://svn.apache.org/viewvc?rev=1329785&view=rev
Log:
OAK-18: Define Oak API
- fix commit
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelRoot.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelRoot.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelRoot.java?rev=1329785&r1=1329784&r2=1329785&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelRoot.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelRoot.java Tue Apr 24 15:26:59 2012
@@ -100,7 +100,7 @@ public class KernelRoot implements Root
@Override
public void refresh() {
- this.base = (KernelNodeState) store.getRoot().getChildNode(workspaceName); // FIXME don't cast to implementation
+ base = (KernelNodeState) store.getRoot().getChildNode(workspaceName); // FIXME don't cast to implementation
}
@Override
@@ -110,8 +110,10 @@ public class KernelRoot implements Root
String targetPath = base.getPath();
String targetRevision = base.getRevision();
kernel.commit(targetPath, changeLog.toJsop(), targetRevision, null);
+
changeLog = new ChangeLog();
- refresh();
+ base = (KernelNodeState) store.getRoot().getChildNode(workspaceName); // FIXME don't cast to implementation
+ root = new KernelTree(base, changeLog);
} catch (MicroKernelException e) {
throw new CommitFailedException(e);
}