svn commit: r1436670 - /archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/GuestUserEnvironmentCheck.java

[olamy]

Author: olamy
Date: Mon Jan 21 22:42:59 2013
New Revision: 1436670

URL: http://svn.apache.org/viewvc?rev=1436670&view=rev
Log:
prevent NPE

Modified:
    
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/GuestUserEnvironmentCheck.java

Modified: 
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/GuestUserEnvironmentCheck.java
URL: 
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/GuestUserEnvironmentCheck.java?rev=1436670&r1=1436669&r2=1436670&view=diff
==============================================================================
--- 
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/GuestUserEnvironmentCheck.java
 (original)
+++ 
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/GuestUserEnvironmentCheck.java
 Mon Jan 21 22:42:59 2013
@@ -53,7 +53,7 @@ public class GuestUserEnvironmentCheck
     private SecuritySystem securitySystem;
 
     @Inject
-    @Named( value = "userConfiguration#default" )
+    @Named(value = "userConfiguration#default")
     private UserConfiguration config;
 
     /**
@@ -86,20 +86,29 @@ public class GuestUserEnvironmentCheck
                 catch ( UserManagerException ume )
                 {
                     violations.add( "unable to initialize guest user properly: 
" + ume.getMessage() );
+                    checked = true;
                     return;
                 }
                 policy.setEnabled( true );
             }
 
-            try
+            if ( guest != null )
             {
-                roleManager.assignRole( config.getString( 
UserConfigurationKeys.DEFAULT_GUEST ), guest.getUsername() );
+
+                try
+                {
+                    roleManager.assignRole( config.getString( 
UserConfigurationKeys.DEFAULT_GUEST ),
+                                            guest.getUsername() );
+                }
+                catch ( RoleManagerException rpe )
+                {
+                    violations.add( "unable to initialize guest user properly: 
" + rpe.getMessage() );
+                }
             }
-            catch ( RoleManagerException rpe )
+            else
             {
-                violations.add( "unable to initialize guest user properly: " + 
rpe.getMessage() );
+                violations.add( "cannot find neither create guest user" );
             }
-
             checked = true;
         }
     }