ref #9204 revert changes to AbstractPersistentCollection, only keep new serialVersion...

[taxeditor.git] / eu.etaxonomy.taxeditor.cdmlib / src / main / java / org / hibernate / collection / internal / AbstractPersistentCollection.java

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 1b2fc8abc59ff18f58b1931ffa4fc629140f1b2f..18101250c9bf197a9495353f5fa9e3fe94be4945 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
@@ -60,19 +60,18 @@ import org.hibernate.type.Type;
 import org.jboss.logging.Logger;
 
 import eu.etaxonomy.cdm.api.application.CdmApplicationRemoteConfiguration;
+import eu.etaxonomy.cdm.cache.ProxyUtils;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.taxeditor.remoting.CdmEagerLoadingException;
-import eu.etaxonomy.taxeditor.remoting.cache.ProxyUtils;
 import eu.etaxonomy.taxeditor.service.ICachedCommonService;
 
 /**
  * Base class implementing {@link org.hibernate.collection.spi.PersistentCollection}
  *
- * This a extended copy of the original class from hibernate. It has been extended to
+ * This is an extended copy of the original class from hibernate. It has been extended to
  * allow making remote service calls to spring httpinvoker services (see section at the bottom
  * of this class).
  *
- *
  * @author Gavin King
  * @author Cherian Mathew
  */
@@ -97,7 +96,7 @@ public abstract class AbstractPersistentCollection implements Serializable, Pers
         * The correct <code>serialVersionUID</code> is the <code>stream classdesc serialVersionUID</code>
         * from the error message.
         */
-       private static final long serialVersionUID = 2742261122392386159L;
+       private static final long serialVersionUID = 7094296207968006972L;
 
        private transient SessionImplementor session;
        private boolean initialized;
@@ -1296,7 +1295,13 @@ public abstract class AbstractPersistentCollection implements Serializable, Pers
                this.owner = owner;
        }
 
-       /** ------ Below is section of code which makes remote service calls ----- */
+/** #################################################################### 
+    
+    ADDED PART: Below is section of code which makes remote service calls 
+    
+    #################################################################### */
+    
+       
        // The affected methods are :
        // initialize(final boolean writing)
        // readSize()
@@ -1312,7 +1317,6 @@ public abstract class AbstractPersistentCollection implements Serializable, Pers
                configuration = conf;
        }
 
-
        private void remoteInitialize() {
 
                if (getOwner() != null && !initialized) {
@@ -1336,9 +1340,9 @@ public abstract class AbstractPersistentCollection implements Serializable, Pers
                                        throw new HibernateException("commonService not initialized (null)");
                                }
 
-                               //Object obj = ProxyUtils.deproxy(cachedCommonService.initializeCollection(this));
-                               Object obj = ProxyUtils.deproxy(cachedCommonService.initializeCollection(cdmBase.getUuid(), fieldName));
-                               if(ProxyUtils.isProxy(obj)) {
+                               //Object obj = ProxyUtils.deproxyIfInitialized(cachedCommonService.initializeCollection(this));
+                               Object obj = ProxyUtils.deproxyIfInitialized(cachedCommonService.initializeCollection(cdmBase.getUuid(), fieldName));
+                               if(ProxyUtils.isUninitializedProxy(obj)) {
                                    throw new HibernateException("Persistent Collection initialized but is still a proxy");
                                }
                                afterInitialize();
@@ -1359,8 +1363,4 @@ public abstract class AbstractPersistentCollection implements Serializable, Pers
                        }
                }
        }
-
-
-
-}
-
+}
\ No newline at end of file