TRUNK-3820: Fixed to avoid NPE

vinayvenu · Dec 10, 2012 · 91116b9 · 91116b9
1 parent 319646e
commit 91116b9
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/api/src/main/java/org/openmrs/validator/PersonNameValidator.java b/api/src/main/java/org/openmrs/validator/PersonNameValidator.java
@@ -54,10 +54,11 @@ public void validate(Object object, Errors errors) {
 		PersonName personName = (PersonName) object;
 		try {
 			// Validate that the person name object is not null
-			if (personName == null)
+			if (personName == null) {
 				errors.reject("error.name");
-			if (!errors.hasErrors() && !personName.isVoided())
+			} else if (!personName.isVoided()) {
 				validatePersonName(personName, errors, true, false);
+			}
 		}
 		catch (Exception e) {
 			errors.reject(e.getMessage());