From 45f85b39204bff2abc1781cdecac96e20e2b0349 Mon Sep 17 00:00:00 2001 From: Katja Luther Date: Tue, 9 Apr 2019 13:58:21 +0200 Subject: [PATCH] ref #8228: fix NPE --- .../eu/etaxonomy/taxeditor/view/e4/AbstractCdmEditorPartE4.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmEditorPartE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmEditorPartE4.java index a1cc6f414..557a2d912 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmEditorPartE4.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmEditorPartE4.java @@ -157,7 +157,7 @@ public abstract class AbstractCdmEditorPartE4 } - if((previousSelection!=null && selection!=null) && activePart.equals(selectionProvidingPart) && + if((previousSelection!=null && selection!=null) && (activePart != null && selectionProvidingPart != null && activePart.equals(selectionProvidingPart)) && (previousSelection==selection || previousSelection.equals(selection) || new StructuredSelection(selection).equals(previousSelection)) -- 2.34.1