Fix NPE check in BindingValidationStatus (#10964)

diff --git a/server/src/main/java/com/vaadin/data/BinderValidationStatus.java b/server/src/main/java/com/vaadin/data/BinderValidationStatus.java
index b9b3f3c19d2edeebb44601021f22d1de400d77c6..a527ac4683fcef8d3a84e9f90e55405ff826d888 100644 (file)
--- a/server/src/main/java/com/vaadin/data/BinderValidationStatus.java
+++ b/server/src/main/java/com/vaadin/data/BinderValidationStatus.java
@@ -90,7 +90,7 @@ public class BinderValidationStatus<BEAN> implements Serializable {
     public BinderValidationStatus(Binder<BEAN> source,
             List<BindingValidationStatus<?>> bindingStatuses,
             List<ValidationResult> binderStatuses) {
-        Objects.requireNonNull(binderStatuses,
+        Objects.requireNonNull(bindingStatuses,
                 "binding statuses cannot be null");
         Objects.requireNonNull(binderStatuses,
                 "binder statuses cannot be null");

diff --git a/server/src/test/java/com/vaadin/data/BinderValidationStatusTest.java b/server/src/test/java/com/vaadin/data/BinderValidationStatusTest.java
index e8b9f415398a7221f92a8f65db9d4c3e93055100..52afdc71a119507ea04de09b793b2677f2a6c76f 100644 (file)
--- a/server/src/test/java/com/vaadin/data/BinderValidationStatusTest.java
+++ b/server/src/test/java/com/vaadin/data/BinderValidationStatusTest.java
@@ -8,9 +8,11 @@ import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -485,4 +487,15 @@ public class BinderValidationStatusTest
         assertEquals(1, results.size());
         assertFalse(results.get(0).isError());
     }
+
+    @Test
+    public void binderValidationStatus_nullBindingStatuses() {
+        try {
+            new BinderValidationStatus<>(new Binder<Person>(), null,
+                    new ArrayList<>());
+            Assert.fail("Binder should throw an NPE");
+        } catch (NullPointerException npe) {
+            assertNotNull(npe.getMessage());
+        }
+    }
 }