Merge branch 'hotfix/3.12.3' into develop

[taxeditor.git] / eu.etaxonomy.taxeditor.cdmlib / src / main / java / org / hibernate / proxy / AbstractLazyInitializer.java

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/proxy/AbstractLazyInitializer.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/proxy/AbstractLazyInitializer.java
index 591594804851422ea9f6ed3ebc1fb14fd54020f0..f9920b67822dd9f39d97619af4c6024a749053e5 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/proxy/AbstractLazyInitializer.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/proxy/AbstractLazyInitializer.java
@@ -203,10 +203,12 @@ public abstract class AbstractLazyInitializer implements LazyInitializer {
 
                                // TODO: On the next major release, add an
                                // 'isJTA' or 'getTransactionFactory' method to Session.
-                               boolean isJTA = session.getTransactionCoordinator()
+                               /*boolean isJTA = session.getTransactionCoordinator()
                                                .getTransactionContext().getTransactionEnvironment()
                                                .getTransactionFactory()
                                                .compatibleWithJtaSynchronization();
+                               */
+                               boolean isJTA = session.getTransactionCoordinator().getTransactionCoordinatorBuilder().isJta();
 
                                if ( !isJTA ) {
                                        // Explicitly handle the transactions only if we're not in