3 files changed, 36 insertions, 3 deletions

diff --git a/java/src/Ice/ObjectPrxHelper.java b/java/src/Ice/ObjectPrxHelper.java
index a4feb35c789..c525bce1dd2 100644
--- a/java/src/Ice/ObjectPrxHelper.java
+++ b/java/src/Ice/ObjectPrxHelper.java
@@ -542,6 +542,9 @@ public class ObjectPrxHelper implements ObjectPrx
         // called upon initialization.
         //
 
+	assert(_reference == null);
+	assert(_delegate == null);
+
         _reference = ref;
 
         if(delegateD != null)
@@ -715,6 +718,10 @@ public class ObjectPrxHelper implements ObjectPrx
         // No need to synchronize, as this operation is only called
         // upon initial initialization.
         //
+
+	assert(_reference == null);
+	assert(_delegate == null);
+
         _reference = ref;
     }
 
diff --git a/java/src/Ice/_ObjectDelD.java b/java/src/Ice/_ObjectDelD.java
index 1b858731776..7d120c0429f 100644
--- a/java/src/Ice/_ObjectDelD.java
+++ b/java/src/Ice/_ObjectDelD.java
@@ -154,12 +154,15 @@ public class _ObjectDelD implements _ObjectDel
         // upon initialization.
         //
 
+	assert(__reference == null);
+	assert(__adapter == null);
+
         __reference = from.__reference;
         __adapter = from.__adapter;
     }
 
-    protected Ice.ObjectAdapter __adapter;
     protected IceInternal.Reference __reference;
+    protected Ice.ObjectAdapter __adapter;
 
     protected final void
     __initCurrent(Current current, String op, Ice.OperationMode mode, java.util.Map context)
@@ -179,6 +182,10 @@ public class _ObjectDelD implements _ObjectDel
         // No need to synchronize, as this operation is only called
         // upon initialization.
         //
+
+	assert(__reference == null);
+	assert(__adapter == null);
+
         __reference = ref;
         __adapter = adapter;
     }
diff --git a/java/src/Ice/_ObjectDelM.java b/java/src/Ice/_ObjectDelM.java
index c2159fcf7ff..11aa5c80dbd 100644
--- a/java/src/Ice/_ObjectDelM.java
+++ b/java/src/Ice/_ObjectDelM.java
@@ -172,13 +172,28 @@ public class _ObjectDelM implements _ObjectDel
         // upon initialization.
         //
 
+	assert(__reference == null);
+	assert(__connection == null);
+
+	if(from.__connection != null)
+	{
+	    from.__connection.incProxyCount();
+	}
+	
+// Can not happen, __connection must be null.
+/*
+	if(__connection != null)
+	{
+	    __connection.decProxyCount();
+	}
+*/
+
         __reference = from.__reference;
         __connection = from.__connection;
-	__connection.incProxyCount();
     }
 
-    protected IceInternal.Connection __connection;
     protected IceInternal.Reference __reference;
+    protected IceInternal.Connection __connection;
 
     public void
     setup(IceInternal.Reference ref)
@@ -187,6 +202,10 @@ public class _ObjectDelM implements _ObjectDel
         // No need to synchronize, as this operation is only called
         // upon initialization.
         //
+
+	assert(__reference == null);
+	assert(__connection == null);
+
         __reference = ref;
 
         if(__reference.reverseAdapter != null)