From f5e60d5cdab741b5daefcb9965ffb43e43685012 Mon Sep 17 00:00:00 2001 From: mindless Date: Tue, 17 Mar 2009 16:54:11 +0000 Subject: [PATCH] [FIXED HUDSON-3300] avoid NPE if reach createAccount with no form data (such as via login?from=/securityRealm/createAccount) git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@16351 71c3de6d-444a-0410-be80-ed276b4c234a --- .../java/hudson/security/HudsonPrivateSecurityRealm.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java b/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java index e52660ff5e..cd18c92d30 100644 --- a/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java +++ b/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java @@ -166,7 +166,7 @@ public class HudsonPrivateSecurityRealm extends SecurityRealm implements ModelOb if(!(si.password1 != null && si.password1.length() != 0)) si.errorMessage = "Password is required"; - if(si.username.length()==0) + if(si.username==null || si.username.length()==0) si.errorMessage = "User name is required"; else { User user = User.get(si.username); @@ -174,13 +174,12 @@ public class HudsonPrivateSecurityRealm extends SecurityRealm implements ModelOb si.errorMessage = "User name is already taken. Did you forget the password?"; } - if(si.fullname.length()==0) + if(si.fullname==null || si.fullname.length()==0) si.fullname = si.username; - if(!si.email.contains("@")) + if(si.email==null || !si.email.contains("@")) si.errorMessage = "Invalid e-mail address"; - if(si.errorMessage!=null) { // failed. ask the user to try again. req.setAttribute("data",si);