summaryrefslogtreecommitdiff
path: root/java/src/Ice/ProxyIdentityFacetKey.java
diff options
context:
space:
mode:
Diffstat (limited to 'java/src/Ice/ProxyIdentityFacetKey.java')
-rw-r--r--java/src/Ice/ProxyIdentityFacetKey.java14
1 files changed, 12 insertions, 2 deletions
diff --git a/java/src/Ice/ProxyIdentityFacetKey.java b/java/src/Ice/ProxyIdentityFacetKey.java
index 1d77df3b82b..18fd132ce53 100644
--- a/java/src/Ice/ProxyIdentityFacetKey.java
+++ b/java/src/Ice/ProxyIdentityFacetKey.java
@@ -40,8 +40,18 @@ public class ProxyIdentityFacetKey
public boolean
equals(java.lang.Object obj)
{
- ProxyIdentityFacetKey other = (ProxyIdentityFacetKey)obj;
- return (_hashCode == other._hashCode) && _identity.equals(other._identity) && _facet.equals(other._facet);
+ if(this == obj)
+ {
+ return true;
+ }
+
+ if(obj instanceof ProxyIdentityFacetKey)
+ {
+ ProxyIdentityFacetKey other = (ProxyIdentityFacetKey)obj;
+ return (_hashCode == other._hashCode) && _identity.equals(other._identity) && _facet.equals(other._facet);
+ }
+
+ return false;
}
public Ice.ObjectPrx