diff options
| author | Pierre-Charles David | 2017-08-31 07:17:42 +0000 |
|---|---|---|
| committer | Pierre-Charles David | 2017-08-31 07:17:46 +0000 |
| commit | 2c5278c78b998b234a95664e37cc647a4c0e77c3 (patch) | |
| tree | eccf9a3c9d8cb51fe51a5a4c6a65e35d117c004c | |
| parent | c960de3c1d3f292e9bf18f3f74396087fc79398f (diff) | |
| download | org.eclipse.sirius-2c5278c78b998b234a95664e37cc647a4c0e77c3.tar.gz org.eclipse.sirius-2c5278c78b998b234a95664e37cc647a4c0e77c3.tar.xz org.eclipse.sirius-2c5278c78b998b234a95664e37cc647a4c0e77c3.zip | |
[518524] Fix potential NPE in SessionEditor
Bug: 518524
Change-Id: I4263add381ccd418b37fa3d16ac14c80b5b07348
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>
| -rw-r--r-- | plugins/org.eclipse.sirius.ui.editor/src/org/eclipse/sirius/ui/editor/SessionEditor.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/plugins/org.eclipse.sirius.ui.editor/src/org/eclipse/sirius/ui/editor/SessionEditor.java b/plugins/org.eclipse.sirius.ui.editor/src/org/eclipse/sirius/ui/editor/SessionEditor.java index fafb6f4a25..f50192748e 100644 --- a/plugins/org.eclipse.sirius.ui.editor/src/org/eclipse/sirius/ui/editor/SessionEditor.java +++ b/plugins/org.eclipse.sirius.ui.editor/src/org/eclipse/sirius/ui/editor/SessionEditor.java @@ -171,6 +171,11 @@ public class SessionEditor extends SharedHeaderFormEditor implements ITabbedProp * */ private void updatePages(ResourceSetChangeEvent event) { + if (pageRegistry == null) { + // Can happen if we're called via a stale listener after the editor + // has already been closed (and pageRegistry set to null). + return; + } List<AbstractSessionEditorPage> newOrderedPages = pageRegistry.getPagesOrdered(this, session, pages.stream().filter(AbstractSessionEditorPage.class::isInstance).map(AbstractSessionEditorPage.class::cast).collect(Collectors.toList()), event); |