You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by md...@apache.org on 2015/06/29 16:09:22 UTC
svn commit: r1688224 -
/jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/PathUtils.java
Author: mduerig
Date: Mon Jun 29 14:09:21 2015
New Revision: 1688224
URL: http://svn.apache.org/r1688224
Log:
OAK-3045: Incorrect assertion message in PathUtils#isAncestor()
Credits to Julian Sedding for spotting this
Modified:
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/PathUtils.java
Modified: jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/PathUtils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/PathUtils.java?rev=1688224&r1=1688223&r2=1688224&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/PathUtils.java (original)
+++ jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/PathUtils.java Mon Jun 29 14:09:21 2015
@@ -16,6 +16,8 @@
*/
package org.apache.jackrabbit.oak.commons;
+import static com.google.common.collect.Sets.newHashSet;
+
import java.util.Iterator;
import java.util.NoSuchElementException;
import java.util.Set;
@@ -24,8 +26,6 @@ import java.util.regex.Pattern;
import javax.annotation.Nonnull;
-import static com.google.common.collect.Sets.newHashSet;
-
/**
* Utility methods to parse a path.
* <p>
@@ -328,7 +328,7 @@ public final class PathUtils {
*/
public static boolean isAncestor(String ancestor, String path) {
assert isValid(ancestor) : "Invalid parent path ["+ancestor+"]";
- assert isValid(path) : "Invalid path ["+ancestor+"]";
+ assert isValid(path) : "Invalid path ["+path+"]";
if (ancestor.isEmpty() || path.isEmpty()) {
return false;
}