[jboss-svn-commits] JBL Code SVN: r33625 - 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-06-24 10:15:47 -0400 (Thu, 24 Jun 2010)
New Revision: 33625

Modified:
   labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/struts/EditJBossProfile.java
Log:
Added condition - check e-mail against nukes only if is changed

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/struts/EditJBossProfile.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/struts/EditJBossProfile.java	2010-06-24 14:09:51 UTC (rev 33624)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/struts/EditJBossProfile.java	2010-06-24 14:15:47 UTC (rev 33625)
@@ -39,9 +39,11 @@
 
   @Override
   public void validate() {
-    List<NukesUser> nukesUser = nukesAccountManager.getNukesAccountsByEmail(getEmail());
-    if (!nukesUser.isEmpty()) {
-      addFieldError("email", getText("account.err.email_taken.text"));
+    if (!getEmail().equals(getTargetUser().getEmail())) {
+      List<NukesUser> nukesUser = nukesAccountManager.getNukesAccountsByEmail(getEmail());
+      if (!nukesUser.isEmpty()) {
+        addFieldError("email", getText("account.err.email_taken.text"));
+      }
     }
     super.validate();
   }