Fixed sonar blocker issue

openmrs · Jan 2, 2014 · ffa219f · ffa219f · djazayeri · Jan 2, 2014
1 parent 358de98
commit ffa219f
Showing 1 changed file with 21 additions and 20 deletions.
diff --git a/api/src/main/java/org/openmrs/validator/UserValidator.java b/api/src/main/java/org/openmrs/validator/UserValidator.java
@@ -85,27 +85,28 @@ public void validate(Object obj, Errors errors) {
 				if (person.getPersonName() == null || StringUtils.isEmpty(person.getPersonName().getFullName()))
 					errors.rejectValue("person", "Person.names.length");
 			}
-		}
-		AdministrationService as = Context.getAdministrationService();
-		boolean emailAsUsername = false;
-		try {
-			Context.addProxyPrivilege(PrivilegeConstants.GET_GLOBAL_PROPERTIES);
-			emailAsUsername = Boolean.parseBoolean(as.getGlobalProperty(
-			    OpenmrsConstants.GLOBAL_PROPERTY_USER_REQUIRE_EMAIL_AS_USERNAME, "false"));
-		}
-		finally {
-			Context.removeProxyPrivilege(PrivilegeConstants.GET_GLOBAL_PROPERTIES);
-		}
-
-		if (emailAsUsername) {
-			boolean isValidUserName = isUserNameAsEmailValid(user.getUsername());
-			if (!isValidUserName) {
-				errors.rejectValue("username", "error.username.email");
+
+			AdministrationService as = Context.getAdministrationService();
+			boolean emailAsUsername = false;
+			try {
+				Context.addProxyPrivilege(PrivilegeConstants.GET_GLOBAL_PROPERTIES);
+				emailAsUsername = Boolean.parseBoolean(as.getGlobalProperty(
+				    OpenmrsConstants.GLOBAL_PROPERTY_USER_REQUIRE_EMAIL_AS_USERNAME, "false"));
 			}
-		} else {
-			boolean isValidUserName = isUserNameValid(user.getUsername());
-			if (!isValidUserName) {
-				errors.rejectValue("username", "error.username.pattern");
+			finally {
+				Context.removeProxyPrivilege(PrivilegeConstants.GET_GLOBAL_PROPERTIES);
+			}
+
+			if (emailAsUsername) {
+				boolean isValidUserName = isUserNameAsEmailValid(user.getUsername());
+				if (!isValidUserName) {
+					errors.rejectValue("username", "error.username.email");
+				}
+			} else {
+				boolean isValidUserName = isUserNameValid(user.getUsername());
+				if (!isValidUserName) {
+					errors.rejectValue("username", "error.username.pattern");
+				}
 			}
 		}
 	}