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

[md...@apache.org]

Author: mduerig
Date: Wed Apr 17 10:11:49 2013
New Revision: 1468820

URL: http://svn.apache.org/r1468820
Log:
OAK-709: Consider moving permission evaluation to the node state level
- implement rebasing of secure node state differences on top of non secure node state giving transient changes precedence: no need to override compareAgainstBaseState
- remove done TODOs

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=1468820&r1=1468819&r2=1468820&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 17 10:11:49 2013
@@ -16,6 +16,10 @@
  */
 package org.apache.jackrabbit.oak.core;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.collect.Iterables.filter;
+import static com.google.common.collect.Iterables.transform;
+
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
@@ -28,19 +32,12 @@ import org.apache.jackrabbit.oak.spi.sta
 import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry;
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
 import org.apache.jackrabbit.oak.spi.state.NodeState;
-import org.apache.jackrabbit.oak.spi.state.NodeStateDiff;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.collect.Iterables.filter;
-import static com.google.common.collect.Iterables.transform;
 
 /**
  * SecureNodeState...
  *
  * TODO: clarify if HIDDEN items should be filtered by this NodeState implementation
  * TODO: clarify usage of ReadStatus in getChildNodeEntries
- * TODO: add proper equals/hashcode implementation
- * TODO: should be package-private
  */
 class SecureNodeState extends AbstractNodeState {
 
@@ -161,13 +158,6 @@ class SecureNodeState extends AbstractNo
         return new MemoryNodeBuilder(this);
     }
 
-    @Override
-    public void compareAgainstBaseState(NodeState base, NodeStateDiff 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 >---
 
     @Override