svn commit: r1396940 - in /jackrabbit/oak/trunk/oak-core/src: main/java/org/apache/jackrabbit/oak/core/TreeImpl.java test/java/org/apache/jackrabbit/oak/TreeTest.java

[mr...@apache.org]

Author: mreutegg
Date: Thu Oct 11 07:45:26 2012
New Revision: 1396940

URL: http://svn.apache.org/viewvc?rev=1396940&view=rev
Log:
OAK-169: Support orderable nodes
- hiding internal properties in Tree breaks ConflictHandler

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/TreeTest.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java?rev=1396940&r1=1396939&r2=1396940&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java Thu Oct 11 07:45:26 2012
@@ -36,8 +36,6 @@ import org.apache.jackrabbit.oak.plugins
 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 org.apache.jackrabbit.oak.spi.state.NodeStateUtils;
-import org.apache.jackrabbit.oak.util.NodeUtil;
 
 import com.google.common.base.Function;
 import com.google.common.base.Predicate;
@@ -528,9 +526,6 @@ public class TreeImpl implements Tree, P
     }
 
     private boolean canReadProperty(String name) {
-        if (NodeStateUtils.isHidden(name)) {
-            return false;
-        }
         String path = PathUtils.concat(getPath(), name);
 
         // FIXME: special handling for access control item and version content

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/TreeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/TreeTest.java?rev=1396940&r1=1396939&r2=1396940&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/TreeTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/TreeTest.java Thu Oct 11 07:45:26 2012
@@ -24,7 +24,6 @@ import org.apache.jackrabbit.oak.api.Con
 import org.apache.jackrabbit.oak.api.ContentSession;
 import org.apache.jackrabbit.oak.api.Root;
 import org.apache.jackrabbit.oak.api.Tree;
-import org.apache.jackrabbit.oak.core.TreeImpl;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
@@ -71,8 +70,8 @@ public class TreeTest extends AbstractOa
             t = r.getTree("/");
             checkSequence(t.getChildren().iterator(), "node3", "node2", "node1");
 
-            // :childOrder property invisible?
-            assertEquals("must not have any properties", 0, t.getPropertyCount());
+            // TODO :childOrder property invisible?
+            //assertEquals("must not have any properties", 0, t.getPropertyCount());
         } finally {
             s.close();
         }