You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2016/11/10 13:26:26 UTC
svn commit: r1769113 - in /jackrabbit/branches/2.8: ./
jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/UtilsGetPathTest.java
jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/JcrUtils.java
Author: reschke
Date: Thu Nov 10 13:26:26 2016
New Revision: 1769113
URL: http://svn.apache.org/viewvc?rev=1769113&view=rev
Log:
JCR-3992: JcrUtils.getOrCreateByPath broken by JCR-3987 (ported to 2.8)
Added:
jackrabbit/branches/2.8/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/UtilsGetPathTest.java
- copied unchanged from r1752165, jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/UtilsGetPathTest.java
Modified:
jackrabbit/branches/2.8/ (props changed)
jackrabbit/branches/2.8/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/JcrUtils.java
Propchange: jackrabbit/branches/2.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 10 13:26:26 2016
@@ -1,3 +1,3 @@
/jackrabbit/branches/JCR-2272:1173165-1176545
/jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1592881,1597717,1597799,1597806,1598035,1598058,1603769,1603934,1609712,1625561,1634584,1667787,1674859,1680757,1709811,1729382,1732436,1740814-1740815,1751279,1758600,1759865,1761679,1761909,1762422,1763558,1766398
+/jackrabbit/trunk:1592881,1597717,1597799,1597806,1598035,1598058,1603769,1603934,1609712,1625561,1634584,1667787,1674859,1680757,1709811,1729382,1732436,1740814-1740815,1751279,1752165,1758600,1759865,1761679,1761909,1762422,1763558,1766398
Modified: jackrabbit/branches/2.8/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/JcrUtils.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/JcrUtils.java?rev=1769113&r1=1769112&r2=1769113&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/JcrUtils.java (original)
+++ jackrabbit/branches/2.8/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/JcrUtils.java Thu Nov 10 13:26:26 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;