added call to remoting with correct check

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java
index ed2f23a14292e89567c4e0111c287ea79fe2c088..90451f8717b2a366dc29022367ff8eceb318c875 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java
@@ -552,10 +552,11 @@ public abstract class AbstractPersistentCollection implements Serializable, Pers
         * @throws LazyInitializationException if we cannot initialize
         */
        protected final void initialize(final boolean writing) {
-               // FIXME:Remoting is it true that session is null => we are in remoting mode
-//             if(session == null) {
-//                     remoteInitialize();
-//             }
+               // In remoting we are sure that session is null
+               // both when using property paths and switching off conversations
+               if(session == null) {
+                       remoteInitialize();
+               }
                
                if ( initialized ) {
                        return;

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 2881be5c3716bdbcc7cd597ef871207394a5e203..d40b90e8561ce82788b43d125f93841dd04f7760 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
@@ -165,10 +165,11 @@ public abstract class AbstractLazyInitializer implements LazyInitializer {
 
        @Override
        public final void initialize() throws HibernateException {
-               // FIXME:Remoting is it true that session is null => we are in remoting mode
-//             if(session == null) {
-//                     remoteInitialize();
-//             }
+               // In remoting we are sure that session is null
+               // both when using property paths and switching off conversations
+               if(session == null) {
+                       remoteInitialize();
+               }
                if ( !initialized ) {
                        if ( specjLazyLoad ) {
                                specialSpecjInitialization();