Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Schindl2013-07-30 08:15:40 -0400
committerTom Schindl2013-07-30 08:15:40 -0400
commitd4238d4e3cd89b15bc4a89ce6fc47328566693f1 (patch)
tree067b330b70641f0515e759900566c76dd13f1cfa
parent5119986688612f13ab11ceabbc83fa56140afe2d (diff)
downloadorg.eclipse.efxclipse-d4238d4e3cd89b15bc4a89ce6fc47328566693f1.tar.gz
org.eclipse.efxclipse-d4238d4e3cd89b15bc4a89ce6fc47328566693f1.tar.xz
org.eclipse.efxclipse-d4238d4e3cd89b15bc4a89ce6fc47328566693f1.zip
Bug 413988 - NPE when IObservableValue disposed who got adapted using
AdapterFactory
-rwxr-xr-xbundles/runtime/org.eclipse.fx.core.databinding/src/org/eclipse/fx/core/databinding/AdapterFactory.java10
1 files changed, 8 insertions, 2 deletions
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 0ec7d4b21..829fbf4b4 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 @@ public class AdapterFactory {
@Override
public void handleDispose(DisposeEvent event) {
- fxInvalidationListeners.clear();
+ if( fxInvalidationListeners != null ) {
+ fxInvalidationListeners.clear();
+ }
+
dbInvalidationListener = null;
- fxChangeListeners.clear();
+ if( fxChangeListeners != null ) {
+ fxChangeListeners.clear();
+ }
+
dbChangeListener = null;
}
});

Back to the top