cleanup

[cdmlib.git] / cdmlib-persistence / src / main / java / eu / etaxonomy / cdm / persistence / hibernate / PostMergeEntityListener.java

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/PostMergeEntityListener.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/PostMergeEntityListener.java
index f189425715a2adb10d1b020b50995e8916dad112..34ad7519edf9d30fd9eda34fc3964eebc6150189 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/PostMergeEntityListener.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/PostMergeEntityListener.java
@@ -32,8 +32,7 @@ import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;
 public class PostMergeEntityListener implements MergeEventListener {
 
     private static final long serialVersionUID = 1565797119368313987L;
-    @SuppressWarnings("unused")
-    private static final Logger logger = LogManager.getLogger(PostMergeEntityListener.class);
+    private static final Logger logger = LogManager.getLogger();
 
     private static Map<Session, Set<CdmBase>> newEntitiesMap = new ConcurrentHashMap<>();
 
@@ -117,8 +116,26 @@ public class PostMergeEntityListener implements MergeEventListener {
             } else if (ITreeNode.class.isAssignableFrom(entityClazz)){ //TaxonNode or TermNode
                 //See PolytomousKeyNode above
                 //Not yet tested if necessary here, too.
-                ITreeNode<?> resultNode = (ITreeNode<?>)result;
-                resultNode.getChildNodes().size();
+
+                try {
+                    ITreeNode<?> resultNode = (ITreeNode<?>)result;
+                    resultNode.getChildNodes().size();
+                } catch (Exception e) {
+                    //#10101
+                    //preliminary catched and logged as it seems to be the cause
+                    //for failing TaxEditor tests in TaxonNameEditorTest
+                    //methods
+                    //    * addDeleteAddHomotypicSynonym,
+                    //    * addDeleteAddHomotypicSynonymWithAnnotations
+                    //    * addHeterotypicSynonym
+                    //    * testAddHomotypicSynonym
+                    //All due to failed to lazily initialize a collection of role: eu.etaxonomy.cdm.model.taxon.TaxonNode.childNodes, could not initialize proxy - no Session
+                    //We need to check if this is an issue in the test behavior or in the solution itself.
+                    //We could also try to atleast add a check if the children list is attached to a session
+                    //before initializing it.
+                    //
+                    logger.warn("Error in PostMergeEntityListener during handleTreeNodes: " + e.getMessage());
+                }
             }
         }
     }