Return an empty collection instead of null from Validatable.getValidators() (#9723)

1 files changed, 5 insertions, 4 deletions

diff --git a/server/src/com/vaadin/ui/AbstractField.java b/server/src/com/vaadin/ui/AbstractField.java
index e7d6d9a4ec..7fc5252eee 100644
--- a/server/src/com/vaadin/ui/AbstractField.java
+++ b/server/src/com/vaadin/ui/AbstractField.java
@@ -776,15 +776,16 @@ public abstract class AbstractField<T> extends AbstractComponent implements
     /**
      * Gets the validators of the field.
      * 
-     * @return the Unmodifiable collection that holds all validators for the
+     * @return An unmodifiable collection that holds all validators for the
      *         field.
      */
     @Override
     public Collection<Validator> getValidators() {
-        if (validators == null || validators.isEmpty()) {
-            return null;
+        if (validators == null) {
+            return Collections.emptyList();
+        } else {
+            return Collections.unmodifiableCollection(validators);
         }
-        return Collections.unmodifiableCollection(validators);
     }
 
     /**