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/IceInternal/LocatorInfo.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/IceInternal/LocatorInfo.java')
| -rw-r--r-- | java/src/IceInternal/LocatorInfo.java | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/java/src/IceInternal/LocatorInfo.java b/java/src/IceInternal/LocatorInfo.java index 42581e6ce9b..63bac9b401d 100644 --- a/java/src/IceInternal/LocatorInfo.java +++ b/java/src/IceInternal/LocatorInfo.java @@ -27,27 +27,17 @@ public final class LocatorInfo public boolean equals(java.lang.Object obj) { - if(obj == null) + if(this == obj) { - return false; + return true; } - if(obj == this) + if(obj instanceof LocatorInfo) { - return true; + return _locator.equals(((LocatorInfo)obj)._locator); } - LocatorInfo rhs = null; - try - { - rhs = (LocatorInfo)obj; - } - catch (ClassCastException ex) - { - return false; - } - - return _locator.equals(rhs._locator); + return false; } public Ice.LocatorPrx |