You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@archiva.apache.org by ol...@apache.org on 2013/01/09 01:05:50 UTC

svn commit: r1430639 - in /archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security: ArchivaAuthorizer.java ArchivaConfigurableUsersManager.java

Author: olamy
Date: Wed Jan  9 00:05:50 2013
New Revision: 1430639

URL: http://svn.apache.org/viewvc?rev=1430639&view=rev
Log:
NPE free and fix find user with only ldap

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaAuthorizer.java
    archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaAuthorizer.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaAuthorizer.java?rev=1430639&r1=1430638&r2=1430639&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaAuthorizer.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaAuthorizer.java Wed Jan  9 00:05:50 2013
@@ -84,7 +84,7 @@ public class ArchivaAuthorizer
                     authorizationException = e;
                 }
 
-                if ( result.isAuthorized() )
+                if ( result != null && result.isAuthorized() )
                 {
                     return result;
                 }

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java?rev=1430639&r1=1430638&r2=1430639&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java Wed Jan  9 00:05:50 2013
@@ -449,7 +449,7 @@ public class ArchivaConfigurableUsersMan
         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;