From 95d3cbbd2ddffcedc5befaf3958ce882830ea702 Mon Sep 17 00:00:00 2001 From: "n.hoffmann" Date: Wed, 5 Aug 2009 13:34:07 +0000 Subject: [PATCH] Fixed a bug that led to NPE in names without references --- .../taxeditor/editor/DuplicateArbitrator.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/DuplicateArbitrator.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/DuplicateArbitrator.java index 866f9425e..e14efe859 100644 --- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/DuplicateArbitrator.java +++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/DuplicateArbitrator.java @@ -120,14 +120,18 @@ public class DuplicateArbitrator { NonViralName name = getName(taxonBase); - ReferenceBase referenceBase = name.getNomenclaturalReference(); - - // query datasource for the reference - List result = CdmStore.getReferenceService().getReferencesByTitle(referenceBase.getTitleCache()); - - // if query delivers results, place possible duplicate in map - for(ReferenceBase duplicateReference : result){ - duplicateReferences.put(taxonBase, duplicateReference); + try{ + ReferenceBase referenceBase = name.getNomenclaturalReference(); + + // query datasource for the reference + List result = CdmStore.getReferenceService().getReferencesByTitle(referenceBase.getTitleCache()); + + // if query delivers results, place possible duplicate in map + for(ReferenceBase duplicateReference : result){ + duplicateReferences.put(taxonBase, duplicateReference); + } + }catch(NullPointerException e){ + logger.warn("Name has no nomenclatural reference"); } } -- 2.34.1