From: Patric Plitzner <p.plitzner@bgbm.org>
Date: Thu, 9 Oct 2014 11:28:48 +0000 (+0000)
Subject: merge-update from trunk
X-Git-Tag: cdmlib-parent-3.4.0~127^2~59
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/commitdiff_plain/fb8945283160dd0456431f3991285800f0812c70

merge-update from trunk
---

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/Abcd206Import.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/Abcd206Import.java
index 27420ad603..60fe56d3de 100644
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/Abcd206Import.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/Abcd206Import.java
@@ -909,7 +909,12 @@ public class Abcd206Import extends SpecimenImportBase<Abcd206ImportConfigurator,
         }
 
         for (String[] fullReference : dataHolder.referenceList) {
+<<<<<<< .working
             List<Reference> references = getReferenceService().list(Reference.class, null, null, null, null);
+=======
+            try{
+                List<Reference> references = getReferenceService().list(Reference.class, null, null, null, null);
+>>>>>>> .merge-rechts.r21726
 
             String strReference=fullReference[0];
             String citationDetail = fullReference[1];
@@ -922,7 +927,17 @@ public class Abcd206Import extends SpecimenImportBase<Abcd206ImportConfigurator,
                         reference =refe;
                         break;
                     }
+<<<<<<< .working
+=======
+                    if (reference ==null){
+                        reference = ReferenceFactory.newGeneric();
+                        reference.setTitleCache(strReference, true);
+                        save(reference, state);
+                    }
+                    determinationEvent.addReference(reference);
+>>>>>>> .merge-rechts.r21726
                 }
+<<<<<<< .working
                 if (reference ==null){
                     reference = ReferenceFactory.newGeneric();
                     reference.setTitleCache(strReference, true);
@@ -930,6 +945,11 @@ public class Abcd206Import extends SpecimenImportBase<Abcd206ImportConfigurator,
                 }
                 determinationEvent.addReference(reference);
             }
+=======
+            } catch (Exception e) {
+                logger.warn("pv getReferenceList " + e);
+            }
+>>>>>>> .merge-rechts.r21726
         }
         save(derivedUnitBase, state);