Bug 413988 - NPE when IObservableValue disposed who got adapted using AdapterFactory
diff --git a/bundles/runtime/org.eclipse.fx.core.databinding/src/org/eclipse/fx/core/databinding/AdapterFactory.java b/bundles/runtime/org.eclipse.fx.core.databinding/src/org/eclipse/fx/core/databinding/AdapterFactory.java index 0ec7d4b..829fbf4 100755 --- a/bundles/runtime/org.eclipse.fx.core.databinding/src/org/eclipse/fx/core/databinding/AdapterFactory.java +++ b/bundles/runtime/org.eclipse.fx.core.databinding/src/org/eclipse/fx/core/databinding/AdapterFactory.java
@@ -389,10 +389,16 @@ @Override public void handleDispose(DisposeEvent event) { - fxInvalidationListeners.clear(); + if( fxInvalidationListeners != null ) { + fxInvalidationListeners.clear(); + } + dbInvalidationListener = null; - fxChangeListeners.clear(); + if( fxChangeListeners != null ) { + fxChangeListeners.clear(); + } + dbChangeListener = null; } });