fix getCurrentSampleDesignation

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/derivative/DerivateLabelProvider.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/derivative/DerivateLabelProvider.java
index 3f1f1aa2d545c1a656b017944ebd677772fb642c..c58592b53cb617b1f708ded160bc68fcc7d5f77c 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/derivative/DerivateLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/derivative/DerivateLabelProvider.java
@@ -441,7 +441,12 @@ public class DerivateLabelProvider extends ColumnLabelProvider {
     public static Identifier getCurrentSampleDesignation(CdmBase entity) {
         if(entity.isInstanceOf(DnaSample.class)){
             DnaSample dnaSample = HibernateProxyHelper.deproxy(entity, DnaSample.class);
-            dnaSample.getIdentifier(DefinedTerm.uuidSampleDesignation);
+            Set<Identifier> identifiers = dnaSample.getIdentifiers_(DefinedTerm.uuidSampleDesignation);
+            Identifier currentIdentifier = null;
+            if (identifiers != null && !identifiers.isEmpty()){
+               currentIdentifier = identifiers.iterator().next();
+            }
+            return currentIdentifier;
         }
         else if(entity.isInstanceOf(Sequence.class)){
             Sequence sequence = HibernateProxyHelper.deproxy(entity, Sequence.class);