ref #7668: add null check for name

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/TaxonNameEditorE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/TaxonNameEditorE4.java
index b65107b46e8cfdbb1f0452c7065674e6b05dbcde..bdcac4e2f54f3239c64f6d87696fc2ac69eb723d 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/TaxonNameEditorE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/TaxonNameEditorE4.java
@@ -745,7 +745,7 @@ public class TaxonNameEditorE4 implements IConversationEnabled, IDirtyMarkable,
     @Optional
     private void updateView(@UIEventTopic(WorkbenchEventConstants.REFRESH_NAME_EDITOR)CdmBase cdmbase){
 
-        if ((EventUtility.getTaxonEditor() != null &&EventUtility.getTaxonEditor().equals(this)) || (this.taxon != null && this.taxon.equals(cdmbase)) || (this.taxon != null && this.taxon.getName().equals(cdmbase))){
+        if ((EventUtility.getTaxonEditor() != null && EventUtility.getTaxonEditor().equals(this)) || (this.taxon != null && (this.taxon.equals(cdmbase) || (this.taxon.getName() != null && this.taxon.getName().equals(cdmbase))))){
             this.redraw(false, true, true, true);
             this.setDirty();
             if (cdmbase instanceof TaxonBase){