svn commit: r1673461 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java

[an...@apache.org]

Author: angela
Date: Tue Apr 14 16:20:34 2015
New Revision: 1673461

URL: http://svn.apache.org/r1673461
Log:
OAK-2674 : Fix FindBug Issues

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java?rev=1673461&r1=1673460&r2=1673461&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java Tue Apr 14 16:20:34 2015
@@ -50,6 +50,7 @@ import org.apache.jackrabbit.oak.api.Typ
 import org.apache.jackrabbit.oak.namepath.NamePathMapper;
 import org.apache.jackrabbit.oak.plugins.identifier.IdentifierManager;
 import org.apache.jackrabbit.oak.plugins.memory.PropertyStates;
+import org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants;
 import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
 import org.apache.jackrabbit.oak.spi.security.SecurityProvider;
 import org.apache.jackrabbit.oak.spi.security.principal.PrincipalImpl;
@@ -487,6 +488,13 @@ class UserImporter implements ProtectedP
 
     private static boolean importPwdNodeProperty(@Nonnull Tree parent, @Nonnull PropInfo propInfo, @Nonnull PropertyDefinition def) throws RepositoryException {
         String propName = propInfo.getName();
+        if (propName == null) {
+            propName = def.getName();
+            if (propName == null || NodeTypeConstants.RESIDUAL_NAME.equals(propName)) {
+                return false;
+            }
+        }
+
         // overwrite any properties generated underneath the rep:pwd node
         // by "UserManagerImpl#setPassword" by the properties defined by
         // the XML to be imported. see OAK-1943 for the corresponding discussion.