fix NPE with abbrev == null in Rank (II)

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/Rank.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/Rank.java
index 997acb16502f4ab486cee445bc8d14e42aaf3588..0a24e1e73d8c3d7bb03426e89a711c3fbbe7ad20 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/Rank.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/Rank.java
@@ -666,11 +666,13 @@ public class Rank extends OrderedTermBase<Rank> {
        public static Rank getRankByAbbreviation(String abbrev, NomenclaturalCode nc, boolean useUnknown) 
                        throws UnknownCdmTypeException{
                
-               
-               
                if (nc != null && nc.equals(NomenclaturalCode.ICZN)) {
-                       if (abbrev != null && abbrev.equalsIgnoreCase("sect.")) { return Rank.SECTION_ZOOLOGY();
-                       } else if (abbrev.equalsIgnoreCase("subsect.")) { return Rank.SUBSECTION_ZOOLOGY();
+                       if (abbrev != null){
+                               if (abbrev.equalsIgnoreCase("sect.")) { 
+                                       return Rank.SECTION_ZOOLOGY();
+                               } else if (abbrev.equalsIgnoreCase("subsect.")) { 
+                                       return Rank.SUBSECTION_ZOOLOGY();
+                               }
                        }
                }
                return getRankByAbbreviation(abbrev, useUnknown);