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/26 22:04:56 UTC
svn commit: r1331056 -
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java
Author: mduerig
Date: Thu Apr 26 20:04:56 2012
New Revision: 1331056
URL: http://svn.apache.org/viewvc?rev=1331056&view=rev
Log:
better names
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java?rev=1331056&r1=1331055&r2=1331056&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java Thu Apr 26 20:04:56 2012
@@ -144,7 +144,7 @@ public class RootImpl implements Root {
return state;
}
- private void rebase(boolean applyChanges) {
+ private void rebase(boolean mergeChanges) {
TreeListener changes = treeListener;
treeListener = new TreeListener();
@@ -152,12 +152,12 @@ public class RootImpl implements Root {
nodeStateBuilder = store.getBuilder(base);
root = new TreeImpl(store, nodeStateBuilder, treeListener);
- if (applyChanges) {
- apply(changes);
+ if (mergeChanges) {
+ merge(changes);
}
}
- private void apply(TreeListener changes) {
+ private void merge(TreeListener changes) {
for (Operation operation : changes.getChanges()) {
try {
switch (operation.type) {