Merge pull request #33 from aalmiray/fix-required-error-key-check

Check against empty requiredError instead of null
dlsc-software-consulting-gmbh · Aug 10, 2018 · 374c6b9 · 374c6b9
2 parents d495a0e + edc5d21
commit 374c6b9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/formsfx-core/src/main/java/com/dlsc/formsfx/model/structure/DataField.java b/formsfx-core/src/main/java/com/dlsc/formsfx/model/structure/DataField.java
@@ -304,9 +304,9 @@ public boolean validate() {
         String newValue = userInput.getValue();
 
         if (!validateRequired(newValue)) {
-            if (isI18N() && requiredErrorKey.get() != null) {
+            if (isI18N() && !requiredErrorKey.get().isEmpty()) {
                 errorMessageKeys.setAll(requiredErrorKey.get());
-            } else if (requiredError.get() != null) {
+            } else if (!requiredError.get().isEmpty()) {
                 errorMessages.setAll(requiredError.get());
             }