- fixed possible null label

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java
index 7cb308c7da84be0cd97811004c592dabb3eff473..76bed186ea4ad880456db650e01541a817c41182 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java
@@ -202,7 +202,9 @@ public class DerivateLabelProvider extends ColumnLabelProvider {
                 }
             }
             else if(((DnaSample) derivate).getRecordBasis()==SpecimenOrObservationType.TissueSample){
                 }
             }
             else if(((DnaSample) derivate).getRecordBasis()==SpecimenOrObservationType.TissueSample){

-                label += dnaSample.getKindOfUnit()+separator;
+                if(dnaSample.getKindOfUnit()!=null){
+                    label += dnaSample.getKindOfUnit()+separator;
+                }

                 Identifier<DnaSample> currentSampleDesignation = getCurrentSampleDesignation(dnaSample);
                 if(currentSampleDesignation!=null && currentSampleDesignation.getIdentifier()!=null){
                     label += currentSampleDesignation.getIdentifier()+separator;
                 Identifier<DnaSample> currentSampleDesignation = getCurrentSampleDesignation(dnaSample);
                 if(currentSampleDesignation!=null && currentSampleDesignation.getIdentifier()!=null){
                     label += currentSampleDesignation.getIdentifier()+separator;