| commit | 8f8e4c431cf7acc993d8e27515fb1724f9771ce5 | [log] [tgz] |
|---|---|---|
| author | lgoubet <laurent.goubet@obeo.fr> | Mon Jan 06 11:11:59 2020 +0100 |
| committer | lgoubet <laurent.goubet@obeo.fr> | Mon Jan 06 11:11:59 2020 +0100 |
| tree | 8aaae840ab0d71756c0c38daa60c9b696cb3bd7c | |
| parent | ec64f3cdb674ccf162628f07639f603461363299 [diff] |
Prevent NPE from the closing of a Comparison Dialog The comparison may have already been cleared before we reach EMFCompareConfiguration.dispose() when closing a comparison dialog. The exact flow to reach this state needs to be investigated Bug: 558505 Change-Id: I32853c967e0709d060d01a86efb9ad2429116c53
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/configuration/EMFCompareConfiguration.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/configuration/EMFCompareConfiguration.java index 427fd8b..33f6745 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/configuration/EMFCompareConfiguration.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/configuration/EMFCompareConfiguration.java
@@ -202,7 +202,9 @@ // EVENT_BUS must not be set to null Comparison comparison = getComparison(); disposeComparison(); - comparison.eAdapters().clear(); + if (comparison != null) { + comparison.eAdapters().clear(); + } } /**