#5249 Correct if statements
authorCherian Mathew <c.mathew@bgbm.org>
Tue, 15 Sep 2015 14:09:13 +0000 (16:09 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Tue, 15 Sep 2015 14:09:13 +0000 (16:09 +0200)
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/DerivedUnit.java

index 61d7f5404536f87dca19ee26fd854d18bf3ded51..e2044b9b0fffbdb5bcba57e298d2cbf3d02a75fa 100644 (file)
@@ -350,13 +350,13 @@ public class DerivedUnit extends SpecimenOrObservationBase<IIdentifiableEntityCa
        }
 
     public String getMostSignificantIdentifier() {
-        if (getAccessionNumber() != null && !getAccessionNumber().isEmpty()) {
+        if (StringUtils.isNotBlank(getAccessionNumber())) {
             return getAccessionNumber();
         }
-        else if(getBarcode()!=null && getBarcode().isEmpty()){
+        else if(StringUtils.isNotBlank(getBarcode())){
             return getBarcode();
         }
-        else if(getCatalogNumber()!=null && getCatalogNumber().isEmpty()){
+        else if(StringUtils.isNotBlank(getCatalogNumber())){
             return getCatalogNumber();
         }
         return null;