svn commit: r1544078 - in /jackrabbit/oak/trunk/oak-mk/src: main/java/org/apache/jackrabbit/mk/model/StagedNodeTree.java test/java/org/apache/jackrabbit/mk/MicroKernelImplTest.java

[stefan]

Author: stefan
Date: Thu Nov 21 09:55:24 2013
New Revision: 1544078

URL: http://svn.apache.org/r1544078
Log:
OAK-552: fixed 'add node with empty name' and re-activated test case

Modified:
    
jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/StagedNodeTree.java
    
jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/MicroKernelImplTest.java

Modified: 
jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/StagedNodeTree.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/StagedNodeTree.java?rev=1544078&r1=1544077&r2=1544078&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/StagedNodeTree.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/StagedNodeTree.java
 Thu Nov 21 09:55:24 2013
@@ -142,6 +142,9 @@ public class StagedNodeTree {
      *                   or if another error occurs
      */
     public void add(String parentNodePath, String nodeName, JsonObject 
nodeData) throws Exception {
+        if (nodeName.isEmpty()) {
+            throw new Exception("cannot add a node with an empty name");
+        }
         StagedNode parent = getStagedNode(parentNodePath, true);
         if (parent.getChildNodeEntry(nodeName) != null) {
             throw new Exception("there's already a child node with name '" + 
nodeName + "'");
@@ -180,6 +183,9 @@ public class StagedNodeTree {
      * @throws Exception if another error occurs
      */
     public void setProperty(String nodePath, String propName, String 
propValue) throws Exception {
+        if (propName.isEmpty()) {
+            throw new Exception("cannot set a property with an empty name");
+        }
         StagedNode node = getStagedNode(nodePath, true);
 
         Map<String, String> properties = node.getProperties();

Modified: 
jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/MicroKernelImplTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/MicroKernelImplTest.java?rev=1544078&r1=1544077&r2=1544078&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/MicroKernelImplTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/MicroKernelImplTest.java
 Thu Nov 21 09:55:24 2013
@@ -415,7 +415,6 @@ public class MicroKernelImplTest {
                 rev, mk.commit("/", "", rev, null));
     }
 
-    @Ignore("OAK-552")  // FIXME OAK-552
     @Test(expected = MicroKernelException.class)
     public void foo() {
         mk.commit("", "+\"/x\":{}", null, null);