commit f5ba8bc8ffe4491ed122a3df47ef2ea0df8b1c4e
author Yuta HIGUCHI <y-higuchi@onlab.us> Thu Oct 09 16:02:29 2014 -0700
committer Yuta HIGUCHI <y-higuchi@onlab.us> Thu Oct 09 16:02:29 2014 -0700
tree 31644e3d4d25fa9262cf8d08a17e20ff7040ed12
parent fa891c9a0fea23d286887f2be64fab42b63b0d6e

Reverting ElementId hashCode + equals logic, which was breaking TopologyManagerTest

- requires further investigation later

Change-Id: I22de937c1ffdd60f674813e5e5dd10b0ddce524b

core/api/src/main/java/org/onlab/onos/net/ElementId.java

diff --git a/core/api/src/main/java/org/onlab/onos/net/ElementId.java b/core/api/src/main/java/org/onlab/onos/net/ElementId.java
index 3f9c88d..d985be8 100644
--- a/core/api/src/main/java/org/onlab/onos/net/ElementId.java
+++ b/core/api/src/main/java/org/onlab/onos/net/ElementId.java
@@ -38,7 +38,7 @@
 
     @Override
     public int hashCode() {
-        return Objects.hash(str);
+        return Objects.hash(uri);
     }
 
     @Override
@@ -49,7 +49,7 @@
         if (obj instanceof ElementId) {
             final ElementId that = (ElementId) obj;
             return this.getClass() == that.getClass() &&
-                    Objects.equals(this.str, that.str);
+                    Objects.equals(this.uri, that.uri);
         }
         return false;
     }