NPE free and fix find user with only ldap

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1430639 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaAuthorizer.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaAuthorizer.java
index cd599fa516ee39fd4d16adcb38eb35d8abf75374..9b0535572cfe3cf5680802a2147ff676ccc4fb91 100644 (file)
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaAuthorizer.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaAuthorizer.java
@@ -84,7 +84,7 @@ public class ArchivaAuthorizer
                     authorizationException = e;
                 }
 
-                if ( result.isAuthorized() )
+                if ( result != null && result.isAuthorized() )
                 {
                     return result;
                 }

diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java
index a87a4c4334885745784f5b88be67b6dc7b0cf71c..853b14d1529633e0d661d0f2a1d26c02b36aeac8 100644 (file)
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java
@@ -449,7 +449,7 @@ public class ArchivaConfigurableUsersManager
         throws UserManagerException
     {
         UserManager userManager = findFirstWritable();
-        if ( userManager.isReadOnly() )
+        if ( userManager == null )
         {
             log.warn( "cannot find writable user manager implementation, skip guest user creation" );
             return null;