[jboss-svn-commits] JBL Code SVN: r36060 - labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/struts.

[jboss-svn-commits at lists.jboss.org]

Author: lkrzyzanek
Date: 2010-11-25 03:18:56 -0500 (Thu, 25 Nov 2010)
New Revision: 36060

Modified:
   labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/struts/EditJBossUserProfile.java
Log:
Fixed validation on usename - performed only when username is changes

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/struts/EditJBossUserProfile.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/struts/EditJBossUserProfile.java	2010-11-24 21:14:53 UTC (rev 36059)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/struts/EditJBossUserProfile.java	2010-11-25 08:18:56 UTC (rev 36060)
@@ -47,7 +47,7 @@
   protected boolean usernameInvalid(String username) {
     return super.usernameInvalid(username) || !username.matches(CreateNewJBossUserAccountAction.ALLOWED_CHARS_REGEXP);
   }
-  
+
   @Override
   public void validate() {
     UserTemplate user = this.getTargetUser();
@@ -61,7 +61,7 @@
     }
     if (user != null && user.getID() > 0) {
       if (user.isSetUsernameSupported()) {
-        if (getUsername() != null && getUsername().length() > 0) {
+        if (getUsername() != null && !getUsername().equals(getTargetUser().getUsername())) {
           if (nukesAccountManager.getAccountByUsername(getUsername()) != null) {
             addFieldError("username", getText("account.err.username_taken.text"));
           }