CLOUDSTACK-6089: Use resource tag's key to determine match in

Marcus Sorensen · Marcus Sorensen · commit 433a2e44b1e9 · 2014-02-12T17:01:54.000-07:00
equals() method for ResourceTagResponse
diff --git a/api/src/org/apache/cloudstack/api/response/ResourceTagResponse.java b/api/src/org/apache/cloudstack/api/response/ResourceTagResponse.java
@@ -102,16 +102,16 @@ public void setCustomer(String customer) {
         this.customer = customer;
     }
 
-    public String getResourceId() {
-        return this.resourceId;
+    public String getKey() {
+        return this.key;
     }
 
     @Override
     public int hashCode() {
         final int prime = 31;
         int result = 1;
-        String rId = this.getResourceId();
-        result = prime * result + ((rId== null) ? 0 : rId.hashCode());
+        String key = this.getKey();
+        result = prime * result + ((key == null) ? 0 : key.hashCode());
         return result;
     }
 
@@ -121,13 +121,14 @@ public boolean equals(Object obj) {
             return true;
         if (obj == null)
             return false;
-        if (this.getClass() != obj.getClass())
+        if (getClass() != obj.getClass())
             return false;
         ResourceTagResponse other = (ResourceTagResponse) obj;
-        String rId = this.getResourceId();
-        if (rId == null && other.getResourceId() != null) {
-            return false;
-        } else if (!rId.equals(other.getResourceId()))
+        String key = this.getKey();
+        if (key == null) {
+            if (other.getKey() != null)
+                return false;
+        } else if (!key.equals(other.getKey()))
             return false;
         return true;
     }
