8279514: NPE on clearing value of IntegerSpinnerValueFactory

Reviewed-by: mhanl, kcr

Author: aghaisas

modules/javafx.controls/src/main/java/javafx/scene/control/SpinnerValueFactory.java

@@ -272,6 +272,8 @@ public ListSpinnerValueFactory(@NamedArg("items") ObservableList<T> items) {
             });
 
             valueProperty().addListener((o, oldValue, newValue) -> {
+                if (newValue == null) return;
+
                 // when the value is set, we need to react to ensure it is a
                 // valid value (and if not, blow up appropriately)
                 int newIndex = -1;
@@ -468,6 +470,8 @@ public IntegerSpinnerValueFactory(@NamedArg("min") int min,
             setConverter(new IntegerStringConverter());
 
             valueProperty().addListener((o, oldValue, newValue) -> {
+                if (newValue == null) return;
+
                 // when the value is set, we need to react to ensure it is a
                 // valid value (and if not, blow up appropriately)
                 if (newValue < getMin()) {
@@ -957,6 +961,8 @@ public LocalDateSpinnerValueFactory(@NamedArg("min") LocalDate min,
             });
 
             valueProperty().addListener((o, oldValue, newValue) -> {
+                if (newValue == null) return;
+
                 // when the value is set, we need to react to ensure it is a
                 // valid value (and if not, blow up appropriately)
                 if (getMin() != null && newValue.isBefore(getMin())) {
@@ -1213,6 +1219,8 @@ public LocalTimeSpinnerValueFactory(@NamedArg("min") LocalTime min,
             });
 
             valueProperty().addListener((o, oldValue, newValue) -> {
+                if (newValue == null) return;
+
                 // when the value is set, we need to react to ensure it is a
                 // valid value (and if not, blow up appropriately)
                 if (getMin() != null && newValue.isBefore(getMin())) {

modules/javafx.controls/src/test/java/test/javafx/scene/control/SpinnerTest.java

@@ -28,6 +28,7 @@
 
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
+import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -122,8 +123,20 @@ public class SpinnerTest {
                 LocalTime.MIN, LocalTime.MAX,
                 LocalTime.now(), 1, ChronoUnit.HOURS);
         localTimeValueFactory = localTimeSpinner.getValueFactory();
+
+        Thread.currentThread().setUncaughtExceptionHandler((thread, throwable) -> {
+            if (throwable instanceof RuntimeException) {
+                throw (RuntimeException)throwable;
+            } else {
+                Thread.currentThread().getThreadGroup().uncaughtException(thread, throwable);
+            }
+        });
     }
 
+    @After
+    public void tearDown() {
+        Thread.currentThread().setUncaughtExceptionHandler(null);
+    }
 
     /***************************************************************************
      *                                                                         *
@@ -1479,4 +1492,29 @@ public void test_jdk_8150946_testCommit_invalid_wrongType() {
             stage.hide();
         }
     }
+
+    @Test public void testSetValueNull_IntegerSpinner() {
+        intValueFactory.setValue(null);
+        assertNull(intSpinner.getValue());
+    }
+
+    @Test public void testSetValueNull_DoubleSpinner() {
+        dblValueFactory.setValue(null);
+        assertNull(dblSpinner.getValue());
+    }
+
+    @Test public void testSetValueNull_ListSpinner() {
+        listValueFactory.setValue(null);
+        assertNull(listSpinner.getValue());
+    }
+
+    @Test public void testSetValueNull_LocalDateSpinner() {
+        localDateValueFactory.setValue(null);
+        assertNull(localDateSpinner.getValue());
+    }
+
+    @Test public void testSetValueNull_LocalTimeSpinner() {
+        localTimeValueFactory.setValue(null);
+        assertNull(localTimeSpinner.getValue());
+    }
 }