jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1331056 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java
Date Thu, 26 Apr 2012 20:04:56 GMT
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) {



Mime
View raw message