Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Olivier Lamy 2013-01-09 00:05:50 +00:00
parent 7b7135cff7
commit 7fcb02920d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaAuthorizer.java
View File

@ -84,7 +84,7 @@ public class ArchivaAuthorizer
authorizationException = e;
}
if ( result.isAuthorized() )
if ( result != null && result.isAuthorized() )
{
return result;
}

2
archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java
View File

@ -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;