fixing NPE in Dwc-A import

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/in/DwcTaxonCsv2CdmTaxonConverter.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/in/DwcTaxonCsv2CdmTaxonConverter.java
index 051781f315c4ac28319c1ec8651d4f66947a617f..95c1f5fac9c4f7aee7759911455f887849d5b06f 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/in/DwcTaxonCsv2CdmTaxonConverter.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/in/DwcTaxonCsv2CdmTaxonConverter.java
@@ -277,15 +277,18 @@ public class DwcTaxonCsv2CdmTaxonConverter extends PartitionableConverterBase<Dw
                }\r
                // by Kingdom\r
                String strKingdom = getValue(item, TermUri.DWC_KINGDOM);\r
-               if (strKingdom.equalsIgnoreCase("Plantae")){\r
-                       nomCode = NomenclaturalCode.ICBN;\r
-               }else if (strKingdom.equalsIgnoreCase("Fungi")){\r
-                       nomCode = NomenclaturalCode.ICBN;\r
-               }else if (strKingdom.equalsIgnoreCase("Animalia")){\r
-                       nomCode = NomenclaturalCode.ICZN;\r
-               }else if (strKingdom.equalsIgnoreCase("Protozoa")){\r
-                       nomCode = NomenclaturalCode.ICZN;\r
+               if (strKingdom != null){\r
+                       if (strKingdom.equalsIgnoreCase("Plantae")){\r
+                               nomCode = NomenclaturalCode.ICBN;\r
+                       }else if (strKingdom.equalsIgnoreCase("Fungi")){\r
+                               nomCode = NomenclaturalCode.ICBN;\r
+                       }else if (strKingdom.equalsIgnoreCase("Animalia")){\r
+                               nomCode = NomenclaturalCode.ICZN;\r
+                       }else if (strKingdom.equalsIgnoreCase("Protozoa")){\r
+                               nomCode = NomenclaturalCode.ICZN;\r
+                       }\r
                }\r
+               \r
                //TODO further kingdoms\r
                if (nomCode == null){\r
                        //TODO warning\r