| commit | fc2652580b67dca1a3bf076c7331638ed883dfc3 | [log] [tgz] |
|---|---|---|
| author | Remy Suen <rsuen> | Fri May 20 18:18:11 2011 +0000 |
| committer | Remy Suen <rsuen> | Fri May 20 18:18:11 2011 +0000 |
| tree | f5f06825ac54962860ee9dc2f64dbdb6ec077796 | |
| parent | e3d06d5c899e129fabd477ddecb91618b76357e6 [diff] |
Bug 346753 PartFocusTest tear down sometimes throws NPE
diff --git a/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/PartRenderingEngine.java b/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/PartRenderingEngine.java index 29712bf..8c528a6 100644 --- a/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/PartRenderingEngine.java +++ b/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/PartRenderingEngine.java
@@ -1011,7 +1011,12 @@ } } } else if (testShell != null && !testShell.isDisposed()) { - testShell.close(); + Object model = testShell.getData(AbstractPartRenderer.OWNING_ME); + if (model instanceof MUIElement) { + removeGui((MUIElement) model); + } else { + testShell.close(); + } } }