Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcdumoulin2012-02-15 09:11:03 -0500
committercdumoulin2012-02-15 09:11:03 -0500
commit945c75a7944e4663d0ac5a58af66def2c456d5fc (patch)
treea4679a1325b4bfd04e350cf4522c8192a5e6c22d /plugins
parentf702ea592c1335f9b4b5ea09f2687ba9cb62b812 (diff)
downloadorg.eclipse.papyrus-945c75a7944e4663d0ac5a58af66def2c456d5fc.tar.gz
org.eclipse.papyrus-945c75a7944e4663d0ac5a58af66def2c456d5fc.tar.xz
org.eclipse.papyrus-945c75a7944e4663d0ac5a58af66def2c456d5fc.zip
ASSIGNED - bug 368704: [sasheditor] SashEditor does not invoke dispose() of nested IEditorPart
https://bugs.eclipse.org/bugs/show_bug.cgi?id=368704 getActiveEditor() test for SashContainer disposal to avoid a NPE
Diffstat (limited to 'plugins')
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/AbstractMultiPageSashEditor.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/AbstractMultiPageSashEditor.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/AbstractMultiPageSashEditor.java
index 5ea52fde209..387e64281dd 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/AbstractMultiPageSashEditor.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/infra/core/sasheditor/editor/AbstractMultiPageSashEditor.java
@@ -212,6 +212,9 @@ public abstract class AbstractMultiPageSashEditor extends EditorPart implements
* Needed by MultiPageActionBarContributor and MultiPageSelectionProvider.
*/
public IEditorPart getActiveEditor() {
+ if( sashContainer.isDisposed())
+ return null;
+
return sashContainer.getActiveEditor();
}

Back to the top