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