Proxies.areEquivalent now supports enums

forge · Feb 20, 2013 · 714a215 · 714a215
1 parent 4447027
commit 714a215
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/proxy/src/main/java/org/jboss/forge/proxy/Proxies.java b/proxy/src/main/java/org/jboss/forge/proxy/Proxies.java
@@ -314,8 +314,22 @@ else if (proxiedObj == null || anotherProxiedObj == null)
 
          boolean sameClassName = unwrapProxyClassName(unproxiedObj.getClass()).equals(
                   unwrapProxyClassName(anotherUnproxiedObj.getClass()));
-         boolean sameHashcode = (unproxiedObj.hashCode() == anotherUnproxiedObj.hashCode());
-         return sameClassName && sameHashcode;
+         if (sameClassName)
+         {
+            if (unproxiedObj.getClass().isEnum())
+            {
+               // Enum hashCode is different if loaded from different classloaders and cannot be overriden.
+               return unproxiedObj.toString().equals(anotherUnproxiedObj.toString());
+            }
+            else
+            {
+               return (unproxiedObj.hashCode() == anotherUnproxiedObj.hashCode());
+            }
+         }
+         else
+         {
+            return false;
+         }
       }
    }