| commit | eebd410a09df9461857f27a090e5f0b77a823d4e | [log] [tgz] |
|---|---|---|
| author | lgoubet <laurent.goubet@obeo.fr> | Thu Sep 19 13:31:29 2019 +0200 |
| committer | lgoubet <laurent.goubet@obeo.fr> | Thu Sep 19 13:34:53 2019 +0200 |
| tree | 2d8713aa0d5c55cc9014cf5c68b7c7f15b6cce87 | |
| parent | 5074797c0219b87449b5692a1521d7cfaafb9420 [diff] |
Potential NPE with some implementations of the property sheet pages Bug: 551217 Change-Id: I94ddcc8fd0f42d69b5cece0989a40b6e54fe2dbb
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EMFCompareContentMergeViewer.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EMFCompareContentMergeViewer.java index 871b82b..0ef734b 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EMFCompareContentMergeViewer.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EMFCompareContentMergeViewer.java
@@ -747,8 +747,12 @@ propertySheetPage.setPropertySourceProvider(fAdapterFactoryContentProvider); getControl().addDisposeListener(new DisposeListener() { public void widgetDisposed(DisposeEvent e) { - propertySheetPage.selectionChanged(activePart, null); propertySheetPage.setPropertySourceProvider(null); + // bug 551238 : protect from potential NPEs + if (propertySheetPage.getControl() != null + && !propertySheetPage.getControl().isDisposed()) { + propertySheetPage.selectionChanged(activePart, null); + } } }); if (newSelectedObject != null) {