jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1409256 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java
Date Wed, 14 Nov 2012 17:01:31 GMT
Author: mduerig
Date: Wed Nov 14 17:01:30 2012
New Revision: 1409256

URL: http://svn.apache.org/viewvc?rev=1409256&view=rev
Log:
OAK-417: Refactor/reimplement TreeImpl.getStatus and TreeImpl.getPropertyStatus to take advantage
of the underlying NodeBuilder
correct behaviour for isModified in case where base state is null

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java?rev=1409256&r1=1409255&r2=1409256&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java
Wed Nov 14 17:01:30 2012
@@ -277,7 +277,7 @@ public class MemoryNodeBuilder implement
                 if (n.getValue() == null) {
                     return true;
                 }
-                if (baseState != null && !baseState.hasChildNode(n.getKey())) {
+                if (baseState == null || !baseState.hasChildNode(n.getKey())) {
                     return true;
                 }
             }
@@ -286,7 +286,7 @@ public class MemoryNodeBuilder implement
                 if (pState == null) {
                     return true;
                 }
-                if (baseState != null && !pState.equals(baseState.getProperty(p.getKey())))
{
+                if (baseState == null || !pState.equals(baseState.getProperty(p.getKey())))
{
                     return true;
                 }
             }



Mime
View raw message