From: Katja Luther <k.luther@bgbm.org>
Date: Thu, 1 Dec 2016 08:14:09 +0000 (+0100)
Subject: avoid NPE when reusing taxonname for taxon creation
X-Git-Tag: 4.4.0^2~6
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/d70c528db1558396e12f24638d6af1fede52fdf3?hp=a6de10b54dde5d7317ea0e60c5934d42c0b70923

avoid NPE when reusing taxonname for taxon creation
---

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
index 563082021..3f6849c95 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
@@ -285,9 +285,12 @@ public class TaxonNodeDetailElement extends AbstractCdmDetailElement<ITaxonTreeN
 		}
 		if (taxonName != null){
 		    taxon = Taxon.NewInstance(taxonName, secundum);
-		    if (!taxonName.getTitleCache().trim().equals(textNewTaxonName.getText().trim())){
-		        textNewTaxonName.setText(taxonName.getTitleCache());
+		    if (textNewTaxonName.getText() == null || !taxonName.getTitleCache().trim().equals(textNewTaxonName.getText().trim())){
+		    	 textNewTaxonName.setText(taxonName.getTitleCache());
 		    }
+//		    if (!taxonName.getTitleCache().trim().equals(textNewTaxonName.getText().trim())){
+//		        textNewTaxonName.setText(taxonName.getTitleCache());
+//		    }
 		} else {
 		    textNewTaxonName.setText(null);
 		}