8243115: Spurious invalidations due to bug in IntegerBinding and other classes

Reviewed-by: arapte, mstrauss

Author: hjohn

modules/javafx.base/src/main/java/javafx/beans/binding/BooleanBinding.java

@@ -67,6 +67,13 @@ public BooleanBinding() {
 
     private boolean value;
     private boolean valid = false;
+
+    /**
+     * Invalidation listener used for observing dependencies.  This
+     * is never cleared once created as there is no way to determine
+     * when all dependencies that were previously bound were removed
+     * in one or more calls to {@link #unbind(Observable...)}.
+     */
     private BindingHelperObserver observer;
     private ExpressionHelper<Boolean> helper = null;
 
@@ -119,7 +126,6 @@ protected final void unbind(Observable... dependencies) {
             for (final Observable dep : dependencies) {
                 dep.removeListener(observer);
             }
-            observer = null;
         }
     }
 

modules/javafx.base/src/main/java/javafx/beans/binding/DoubleBinding.java

@@ -113,6 +113,13 @@ public abstract class DoubleBinding extends DoubleExpression implements
 
     private double value;
     private boolean valid;
+
+    /**
+     * Invalidation listener used for observing dependencies.  This
+     * is never cleared once created as there is no way to determine
+     * when all dependencies that were previously bound were removed
+     * in one or more calls to {@link #unbind(Observable...)}.
+     */
     private BindingHelperObserver observer;
     private ExpressionHelper<Number> helper = null;
 
@@ -171,7 +178,6 @@ protected final void unbind(Observable... dependencies) {
             for (final Observable dep : dependencies) {
                 dep.removeListener(observer);
             }
-            observer = null;
         }
     }
 

modules/javafx.base/src/main/java/javafx/beans/binding/FloatBinding.java

@@ -63,6 +63,13 @@ public abstract class FloatBinding extends FloatExpression implements
 
     private float value;
     private boolean valid;
+
+    /**
+     * Invalidation listener used for observing dependencies.  This
+     * is never cleared once created as there is no way to determine
+     * when all dependencies that were previously bound were removed
+     * in one or more calls to {@link #unbind(Observable...)}.
+     */
     private BindingHelperObserver observer;
     private ExpressionHelper<Number> helper = null;
 
@@ -121,7 +128,6 @@ protected final void unbind(Observable... dependencies) {
             for (final Observable dep : dependencies) {
                 dep.removeListener(observer);
             }
-            observer = null;
         }
     }
 

modules/javafx.base/src/main/java/javafx/beans/binding/IntegerBinding.java

@@ -63,6 +63,13 @@ public abstract class IntegerBinding extends IntegerExpression implements
 
     private int value;
     private boolean valid = false;
+
+    /**
+     * Invalidation listener used for observing dependencies.  This
+     * is never cleared once created as there is no way to determine
+     * when all dependencies that were previously bound were removed
+     * in one or more calls to {@link #unbind(Observable...)}.
+     */
     private BindingHelperObserver observer;
     private ExpressionHelper<Number> helper = null;
 
@@ -121,7 +128,6 @@ protected final void unbind(Observable... dependencies) {
             for (final Observable dep : dependencies) {
                 dep.removeListener(observer);
             }
-            observer = null;
         }
     }
 

modules/javafx.base/src/main/java/javafx/beans/binding/ListBinding.java

@@ -81,6 +81,13 @@ public void onChanged(Change<? extends E> change) {
 
     private ObservableList<E> value;
     private boolean valid = false;
+
+    /**
+     * Invalidation listener used for observing dependencies.  This
+     * is never cleared once created as there is no way to determine
+     * when all dependencies that were previously bound were removed
+     * in one or more calls to {@link #unbind(Observable...)}.
+     */
     private BindingHelperObserver observer;
     private ListExpressionHelper<E> helper = null;
 
@@ -211,7 +218,6 @@ protected final void unbind(Observable... dependencies) {
                     dep.removeListener(observer);
                 }
             }
-            observer = null;
         }
     }
 

modules/javafx.base/src/main/java/javafx/beans/binding/LongBinding.java

@@ -63,6 +63,13 @@ public abstract class LongBinding extends LongExpression implements
 
     private long value;
     private boolean valid = false;
+
+    /**
+     * Invalidation listener used for observing dependencies.  This
+     * is never cleared once created as there is no way to determine
+     * when all dependencies that were previously bound were removed
+     * in one or more calls to {@link #unbind(Observable...)}.
+     */
     private BindingHelperObserver observer;
     private ExpressionHelper<Number> helper = null;
 
@@ -121,7 +128,6 @@ protected final void unbind(Observable... dependencies) {
             for (final Observable dep : dependencies) {
                 dep.removeListener(observer);
             }
-            observer = null;
         }
     }
 

modules/javafx.base/src/main/java/javafx/beans/binding/ObjectBinding.java

@@ -63,6 +63,13 @@ public abstract class ObjectBinding<T> extends ObjectExpression<T> implements
 
     private T value;
     private boolean valid = false;
+
+    /**
+     * Invalidation listener used for observing dependencies.  This
+     * is never cleared once created as there is no way to determine
+     * when all dependencies that were previously bound were removed
+     * in one or more calls to {@link #unbind(Observable...)}.
+     */
     private BindingHelperObserver observer;
     private ExpressionHelper<T> helper = null;
 
@@ -121,7 +128,6 @@ protected final void unbind(Observable... dependencies) {
             for (final Observable dep : dependencies) {
                 dep.removeListener(observer);
             }
-            observer = null;
         }
     }
 

modules/javafx.base/src/main/java/javafx/beans/binding/StringBinding.java

@@ -62,6 +62,13 @@ public abstract class StringBinding extends StringExpression implements
 
     private String value;
     private boolean valid = false;
+
+    /**
+     * Invalidation listener used for observing dependencies.  This
+     * is never cleared once created as there is no way to determine
+     * when all dependencies that were previously bound were removed
+     * in one or more calls to {@link #unbind(Observable...)}.
+     */
     private BindingHelperObserver observer;
     private ExpressionHelper<String> helper = null;
 
@@ -120,7 +127,6 @@ protected final void unbind(Observable... dependencies) {
             for (final Observable dep : dependencies) {
                 dep.removeListener(observer);
             }
-            observer = null;
         }
     }