- fixed possible null label
authorPatric Plitzner <p.plitzner@bgbm.org>
Thu, 11 Dec 2014 20:33:21 +0000 (20:33 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Thu, 11 Dec 2014 20:33:21 +0000 (20:33 +0000)
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java

index 7cb308c7da84be0cd97811004c592dabb3eff473..76bed186ea4ad880456db650e01541a817c41182 100644 (file)
@@ -202,7 +202,9 @@ public class DerivateLabelProvider extends ColumnLabelProvider {
                 }
             }
             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;