svn commit: r1752165 - in /jackrabbit/trunk: jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/UtilsGetPathTest.java jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/JcrUtils.java

[re...@apache.org]

Author: reschke
Date: Mon Jul 11 14:44:14 2016
New Revision: 1752165

URL: http://svn.apache.org/viewvc?rev=1752165&view=rev
Log:
JCR-3992: JcrUtils.getOrCreateByPath broken by JCR-3987

Added:
    jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/UtilsGetPathTest.java   (with props)
Modified:
    jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/JcrUtils.java

Added: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/UtilsGetPathTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/UtilsGetPathTest.java?rev=1752165&view=auto
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/UtilsGetPathTest.java (added)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/UtilsGetPathTest.java Mon Jul 11 14:44:14 2016
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.core.integration;
+
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+
+import org.apache.jackrabbit.commons.JcrUtils;
+import org.apache.jackrabbit.test.AbstractJCRTest;
+import org.junit.Test;
+
+/**
+ * @see <a href="https://issues.apache.org/jira/browse/JCR-3992">JCR-3992</a>
+ */
+public class UtilsGetPathTest extends AbstractJCRTest {
+
+    @Test
+    public void testGetOrCreateByPath1() throws RepositoryException {
+        String path ="/foo";
+        Node node = JcrUtils.getOrCreateByPath(path, "nt:unstructured", superuser);
+        superuser.save();
+        assertEquals(path, node.getPath());
+        assertTrue(superuser.nodeExists(path));
+
+        // existing top-level node, two new descendant nodes
+        String path2 ="/foo/a/b";
+        Node node2 = JcrUtils.getOrCreateByPath(path2, "nt:unstructured", superuser);
+        superuser.save();
+        assertEquals(path2, node2.getPath());
+        assertTrue(superuser.nodeExists(path2));
+    }
+}

Propchange: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/UtilsGetPathTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/UtilsGetPathTest.java
------------------------------------------------------------------------------
    svn:executable = *

Modified: jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/JcrUtils.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/JcrUtils.java?rev=1752165&r1=1752164&r2=1752165&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/JcrUtils.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/JcrUtils.java Mon Jul 11 14:44:14 2016
@@ -1556,12 +1556,12 @@ public class JcrUtils {
                 existingPath = temp;
                 break;
             }
-            currentIndex = temp.lastIndexOf("/");
+            currentIndex = temp.lastIndexOf('/');
         }
 
         if (existingPath != null) {
             baseNode = baseNode.getSession().getNode(existingPath);
-            path = path.substring(existingPath.length() + 1);
+            path = fullPath.substring(existingPath.length() + 1);
         }
 
         Node node = baseNode;