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