1 files changed, 11 insertions, 2 deletions
diff --git a/java/src/Ice/ObjectPrxHelperBase.java b/java/src/Ice/ObjectPrxHelperBase.java
index 7c7406a6f7c..1ba89f7c060 100644
--- a/java/src/Ice/ObjectPrxHelperBase.java
+++ b/java/src/Ice/ObjectPrxHelperBase.java
@@ -559,8 +559,17 @@ public class ObjectPrxHelperBase implements ObjectPrx
     public final boolean
     equals(java.lang.Object r)
     {
-        ObjectPrxHelperBase rhs = (ObjectPrxHelperBase)r;
-        return _reference.equals(rhs._reference);
+	if(this == r)
+	{
+	    return true;
+	}
+
+	if(r instanceof ObjectPrxHelperBase)
+	{
+	    return _reference.equals(((ObjectPrxHelperBase)r)._reference);
+	}
+
+	return false;
     }
 
     public final IceInternal.Reference