Bug 395642 - Conflict Commands

Take the ABS value of the hash code to prevent the int overflow
that can cause this problem on some JVMs.

1 files changed, 8 insertions, 6 deletions

diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/util/Util.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/util/Util.java
index bab97ce857b..eabea1ea3e1 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/util/Util.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/util/Util.java
@@ -245,18 +245,20 @@ public final class Util {
      *         <code>null</code>. Otherwise, the left identity hash code
      *         minus the right identity hash code.
      */
-    public static final int compareIdentity(Object left, Object right) {
-        if (left == null && right == null) {
+	public static final int compareIdentity(Object left, Object right) {
+		if (left == null && right == null) {
 			return 0;
 		} else if (left == null) {
 			return -1;
 		} else if (right == null) {
 			return 1;
-		} else {
-			return System.identityHashCode(left)
-                    - System.identityHashCode(right);
 		}
-    }
+		int rc = Math.abs(System.identityHashCode(left)) - Math.abs(System.identityHashCode(right));
+		if (rc != 0) {
+			return rc;
+		}
+		return left == right ? 0 : System.identityHashCode(left) - System.identityHashCode(right);
+	}
 
     public static void diff(Map left, Map right, Set leftOnly, Set different,
             Set rightOnly) {