Author: mduerig
Date: Thu Apr 26 10:42:42 2012
New Revision: 1330767
URL: http://svn.apache.org/viewvc?rev=1330767&view=rev
Log:
OAK-18: Define Oak API
- alternative implementation which implements a fully persisted transient
space: compare correct node states to determine modification status
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl2.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl2.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl2.java?rev=1330767&r1=1330766&r2=1330767&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl2.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl2.java
Thu Apr 26 10:42:42 2012
@@ -238,7 +238,7 @@ public class TreeImpl2 implements Tree {
return Status.NEW;
}
else {
- if (equals(baseState, getNodeState())) {
+ if (isSame(baseState.getChildNode(name),
getNodeState().getChildNode(name))) {
return Status.EXISTING;
}
else {
@@ -385,7 +385,7 @@ public class TreeImpl2 implements Tree {
return builder.getNodeState();
}
- private boolean equals(NodeState state1, NodeState state2) {
+ private boolean isSame(NodeState state1, NodeState state2) {
final boolean[] isDirty = {false};
store.compare(state1, state2, new NodeStateDiff() {
@Override
