svn commit: r1569677 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeState.java

[jukka]

Author: jukka
Date: Wed Feb 19 10:50:44 2014
New Revision: 1569677

URL: http://svn.apache.org/r1569677
Log:
OAK-1226: Same node and property name support

A child node and and a property can now have the same name

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

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeState.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeState.java?rev=1569677&r1=1569676&r2=1569677&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeState.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeState.java
 Wed Feb 19 10:50:44 2014
@@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.plugin
 import static 
org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
 import static 
org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.MISSING_NODE;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -51,7 +50,6 @@ class MemoryNodeState extends AbstractNo
     public MemoryNodeState(
             Map<String, PropertyState> properties,
             Map<String, NodeState> nodes) {
-        assert Collections.disjoint(properties.keySet(), nodes.keySet());
         this.properties = properties;
         this.nodes = nodes;
     }