From cd9e44c177c5dd5bab845da30d1b16e1e72fc08e Mon Sep 17 00:00:00 2001
From: Cherian Mathew <c.mathew@bgbm.org>
Date: Tue, 25 Feb 2014 08:03:44 +0000
Subject: [PATCH] disabling remoting calls untill further investigation

---
 .../AbstractPersistentCollection.java         | 28 +++++++++++--------
 .../proxy/AbstractLazyInitializer.java        |  9 +++---
 2 files changed, 21 insertions(+), 16 deletions(-)

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 44d62da34..ed2f23a14 100644
--- 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,21 +552,25 @@ 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();
+//		}
+		
 		if ( initialized ) {
 			return;
 		}
-		// Adding remote call
-		remoteInitialize();
+
 		
-//		withTemporarySessionIfNeeded(
-//				new LazyInitializationWork<Object>() {
-//					@Override
-//					public Object doWork() {
-//						session.initializeCollection( AbstractPersistentCollection.this, writing );
-//						return null;
-//					}
-//				}
-//		);
+		withTemporarySessionIfNeeded(
+				new LazyInitializationWork<Object>() {
+					@Override
+					public Object doWork() {
+						session.initializeCollection( AbstractPersistentCollection.this, writing );
+						return null;
+					}
+				}
+		);
 	}
 
 	private void throwLazyInitializationExceptionIfNotConnected() {
@@ -1194,7 +1198,7 @@ public abstract class AbstractPersistentCollection implements Serializable, Pers
 	
 	private void remoteInitialize() {
 		
-		if (getOwner() != null && !wasInitialized()) {			
+		if (getOwner() != null && !initialized) {			
 			
 			try {
 				String role = getRole();
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 57d166b25..2881be5c3 100644
--- 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,9 +165,10 @@ public abstract class AbstractLazyInitializer implements LazyInitializer {
 
 	@Override
 	public final void initialize() throws HibernateException {
-		if( !initialized) {
-			remoteInitialize();
-		}
+		// FIXME:Remoting is it true that session is null => we are in remoting mode
+//		if(session == null) {
+//			remoteInitialize();
+//		}
 		if ( !initialized ) {
 			if ( specjLazyLoad ) {
 				specialSpecjInitialization();
@@ -429,7 +430,7 @@ public abstract class AbstractLazyInitializer implements LazyInitializer {
 	
 	private void remoteInitialize() {		
 		
-		if(isUninitialized()) {				
+		if(!initialized) {				
 			int classid = ((Integer)getIdentifier()).intValue();
 			System.out.print("--> Remote Lazy Initializing" + getEntityName() + " with id " + classid);
 			Class clazz;
-- 
2.34.1