Merge branch 'JENKINS-7096' of https://github.com/mc1arke/jenkins

Conflicts: changelog.html
jenkinsci · Jan 16, 2012 · cc571a3 · cc571a3
2 parents c937126 + 255a3e6
commit cc571a3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/changelog.html b/changelog.html
@@ -66,6 +66,9 @@
   <li class="rfe">
     No workspace available message includes wiped out workspace as a potential cause.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-10432">issue 10432</a>)
+  <li class="bug">
+  Stop users being created in memory if they failed to provide all the required registration information correctly.
+   (<a href="https://issues.jenkins-ci.org/browse/JENKINS-7096">issue 7096</a>)
 </ul>
 </div><!--=TRUNK-END=-->
 

diff --git a/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java b/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java
@@ -302,9 +302,9 @@ private User createAccount(StaplerRequest req, StaplerResponse rsp, boolean self
         if(si.username==null || si.username.length()==0)
             si.errorMessage = "User name is required";
         else {
-            User user = User.get(si.username);
-            if(user.getProperty(Details.class)!=null)
-                si.errorMessage = "User name is already taken. Did you forget the password?";
+            User user = User.get(si.username, false);
+            if (null != user)
+                si.errorMessage = "User name is already taken";
         }
 
         if(si.fullname==null || si.fullname.length()==0)