Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbblajer2006-12-20 13:25:15 +0000
committerbblajer2006-12-20 13:25:15 +0000
commitfe1357f85ca664e776d5b29283517ddacf3e836d (patch)
tree3c7f48a6e04194829fe70f8f330453604c1957b7 /plugins/org.eclipse.gmf.runtime.lite/src/org
parent4ca54ddeb9ab5ab8a4aaa423c79fe23b2de68887 (diff)
downloadorg.eclipse.gmf-tooling-fe1357f85ca664e776d5b29283517ddacf3e836d.tar.gz
org.eclipse.gmf-tooling-fe1357f85ca664e776d5b29283517ddacf3e836d.tar.xz
org.eclipse.gmf-tooling-fe1357f85ca664e776d5b29283517ddacf3e836d.zip
NPE in DiagramEditor.dispose()
Diffstat (limited to 'plugins/org.eclipse.gmf.runtime.lite/src/org')
-rw-r--r--plugins/org.eclipse.gmf.runtime.lite/src/org/eclipse/gmf/runtime/lite/parts/DiagramEditor.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/org.eclipse.gmf.runtime.lite/src/org/eclipse/gmf/runtime/lite/parts/DiagramEditor.java b/plugins/org.eclipse.gmf.runtime.lite/src/org/eclipse/gmf/runtime/lite/parts/DiagramEditor.java
index 64362113e..70d2c3824 100644
--- a/plugins/org.eclipse.gmf.runtime.lite/src/org/eclipse/gmf/runtime/lite/parts/DiagramEditor.java
+++ b/plugins/org.eclipse.gmf.runtime.lite/src/org/eclipse/gmf/runtime/lite/parts/DiagramEditor.java
@@ -169,14 +169,14 @@ public abstract class DiagramEditor extends EditorPart implements IDiagramManage
if (myDiagramDisplayer != null) {
getCommandStack().removeCommandStackEventListener(mySaveListener);
getCommandStack().removeCommandStackListener(commandStackListener);
- myDiagramDisplayer.dispose();
- myDiagramDisplayer = null;
ForceTrackingModificationAdapter adapter = (ForceTrackingModificationAdapter) EcoreUtil.getExistingAdapter(getEditingDomain().getResourceSet(), ForceTrackingModificationAdapter.class);
assert adapter != null;
adapter.release();
if (adapter.isReleased()) {
getEditingDomain().getResourceSet().eAdapters().remove(adapter);
}
+ myDiagramDisplayer.dispose();
+ myDiagramDisplayer = null;
}
super.dispose();
}

Back to the top