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 tr...@apache.org on 2014/09/07 08:37:11 UTC
svn commit: r1622978 -
/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/NameValidator.java
Author: tripod
Date: Sun Sep 7 06:37:11 2014
New Revision: 1622978
URL: http://svn.apache.org/r1622978
Log:
remove wrong checkin of merge conflict (fighting with git-svn)
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/NameValidator.java
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/NameValidator.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/NameValidator.java?rev=1622978&r1=1622977&r2=1622978&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/NameValidator.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/NameValidator.java Sun Sep 7 06:37:11 2014
@@ -76,15 +76,6 @@ class NameValidator extends DefaultValid
for (String value : property.getValue(NAMES)) {
checkValidValue(value);
}
-<<<<<<< HEAD
-=======
- } else if (Type.PATH.equals(property.getType()) || Type.PATHS.equals(property.getType())) {
- for (String value : property.getValue(Type.PATHS)) {
- for (String name: PathUtils.elements(value)) {
- checkValidValue(name);
- }
- }
->>>>>>> 399b34e... OAK-2078 Prevent null/empty passwords in ldap provider
}
}