svn commit: r1466554 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeState.java

[an...@apache.org]

Author: angela
Date: Wed Apr 10 16:37:42 2013
New Revision: 1466554

URL: http://svn.apache.org/r1466554
Log:
OAK-709: fix compareAgainstBaseState that caused inconsistencies during Root#commit and adjust fixme to remind us of the open issue/discussion whether secure-states or the underlaying nodestates should be compared.

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeState.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeState.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeState.java?rev=1466554&r1=1466553&r2=1466554&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeState.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeState.java Wed Apr 10 16:37:42 2013
@@ -240,8 +240,9 @@ public class SecureNodeState extends Abs
 
     @Override
     public void compareAgainstBaseState(NodeState base, NodeStateDiff diff) {
-        // FIXME: should not bypass access controls
-        state.compareAgainstBaseState(base, diff);
+        // FIXME: decide if comparison during commit should compare the secure
+        // states or the original node states without ac restrictions
+        super.compareAgainstBaseState(base, diff);
     }
 
     //-------------------------------------------------------------< Object >---