diff options
| author | Mark Spruiell <mes@zeroc.com> | 2006-01-11 22:20:47 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2006-01-11 22:20:47 +0000 |
| commit | 9ce7664c50e5a3a7076b223fa9fafe11cc3d0fee (patch) | |
| tree | da8e49c37aa6d2122b49ddde0ff7298e1b92b3ac /java/src/Ice/ObjectPrxHelperBase.java | |
| parent | file rtf.hdr was initially added on branch R3_0_branch. (diff) | |
| download | ice-9ce7664c50e5a3a7076b223fa9fafe11cc3d0fee.tar.bz2 ice-9ce7664c50e5a3a7076b223fa9fafe11cc3d0fee.tar.xz ice-9ce7664c50e5a3a7076b223fa9fafe11cc3d0fee.zip | |
fixing bug 732: equals() can raise ClassCastException
Diffstat (limited to 'java/src/Ice/ObjectPrxHelperBase.java')
| -rw-r--r-- | java/src/Ice/ObjectPrxHelperBase.java | 13 |
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 |