jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r1468441 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak: core/SecureNodeState.java kernel/KernelNodeState.java
Date Tue, 16 Apr 2013 14:40:41 GMT
Author: jukka
Date: Tue Apr 16 14:40:40 2013
New Revision: 1468441

URL: http://svn.apache.org/r1468441
Log:
OAK-709: Consider moving permission evaluation to the node state level

Remove the earlier equals() hack, and make SecureNodeState package-private

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeState.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeState.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=1468441&r1=1468440&r2=1468441&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
Tue Apr 16 14:40:40 2013
@@ -44,7 +44,7 @@ import static com.google.common.base.Pre
  * TODO: add proper equals/hashcode implementation
  * TODO: should be package-private
  */
-public class SecureNodeState extends AbstractNodeState {
+class SecureNodeState extends AbstractNodeState {
 
     /**
      * Underlying root state, used to optimize a common case

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeState.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeState.java?rev=1468441&r1=1468440&r2=1468441&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeState.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeState.java
Tue Apr 16 14:40:40 2013
@@ -45,7 +45,6 @@ import org.apache.jackrabbit.mk.json.Jso
 import org.apache.jackrabbit.oak.api.PropertyState;
 import org.apache.jackrabbit.oak.api.Type;
 import org.apache.jackrabbit.oak.commons.PathUtils;
-import org.apache.jackrabbit.oak.core.SecureNodeState;
 import org.apache.jackrabbit.oak.plugins.memory.BinaryPropertyState;
 import org.apache.jackrabbit.oak.plugins.memory.BooleanPropertyState;
 import org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState;
@@ -375,11 +374,6 @@ public final class KernelNodeState exten
      */
     @Override
     public boolean equals(Object object) {
-        // FIXME: temporary solution (see discussion in OAK-709)
-        if (object instanceof SecureNodeState) {
-            return object.equals(this);
-        }
-
         if (this == object) {
             return true;
         } else if (object instanceof KernelNodeState) {



Mime
View raw message