#5066 Remove unnecessary merge listener

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

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/CdmListenerIntegrator.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/CdmListenerIntegrator.java
index 53f27a3ca70144f37e3b1938e2921d687615527a..9d69c20d24a1b6abe06f618f8cd6a9f7274f1d1c 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/CdmListenerIntegrator.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/CdmListenerIntegrator.java
@@ -49,14 +49,8 @@ public class CdmListenerIntegrator implements Integrator {
                // this example will register a persist event listener
                eventRegistry.prependListeners(EventType.SAVE, new CacheStrategyGenerator(), new SaveEntityListener());
                eventRegistry.prependListeners(EventType.UPDATE, new CacheStrategyGenerator(), new UpdateEntityListener());
-
-               eventRegistry.prependListeners(EventType.SAVE_UPDATE, new CacheStrategyGenerator(), new SaveOrUpdateorMergeEntityListener());
-               eventRegistry.prependListeners(EventType.MERGE, new CacheStrategyGenerator(), new SaveOrUpdateorMergeEntityListener());
-
-//             eventRegistry.prependListeners(EventType.SAVE_UPDATE, new CacheStrategyGenerator(), new SaveOrUpdateEntityListener());
-               //TODO Cherian move to SaveOrUpdateorMergeEntityListener
+               eventRegistry.prependListeners(EventType.SAVE_UPDATE, new CacheStrategyGenerator(), new SaveOrUpdateEntityListener());
                eventRegistry.appendListeners(EventType.MERGE, new PostMergeEntityListener());
-
                eventRegistry.appendListeners(EventType.DELETE, new CdmDeleteListener());
                eventRegistry.appendListeners(EventType.POST_LOAD, new CdmPostDataChangeObservableListener());
 //with validation