git commit: updated refs/heads/master to d33798f

[ml...@apache.org]

Updated Branches:
  refs/heads/master 9f597ef13 -> d33798f0d


CLOUDSTACK-6089: Implement equals() method for ResourceTagResponse
so that the java Set can properly determine if a ResourceTagResponse
is unique. This ensures we don't get duplicate resource tags showing
up any time a UserVmResponse is crafted (which can be quite often
due to the way the responses are crafted).


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d33798f0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d33798f0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d33798f0

Branch: refs/heads/master
Commit: d33798f0d9165f0e7d36dec869201b9334666267
Parents: 9f597ef
Author: Marcus Sorensen <ma...@betterservers.com>
Authored: Wed Feb 12 16:07:34 2014 -0700
Committer: Marcus Sorensen <ma...@betterservers.com>
Committed: Wed Feb 12 16:10:48 2014 -0700

----------------------------------------------------------------------
 .../api/response/ResourceTagResponse.java       | 30 ++++++++++++++++++++
 1 file changed, 30 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d33798f0/api/src/org/apache/cloudstack/api/response/ResourceTagResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ResourceTagResponse.java b/api/src/org/apache/cloudstack/api/response/ResourceTagResponse.java
index 839876e..d8fb782 100644
--- a/api/src/org/apache/cloudstack/api/response/ResourceTagResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ResourceTagResponse.java
@@ -109,4 +109,34 @@ public class ResourceTagResponse extends BaseResponse implements ControlledViewE
     public void setCustomer(String customer) {
         this.customer = customer;
     }
+
+    public String getResourceId() {
+        return this.resourceId;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        String rId = this.getResourceId();
+        result = prime * result + ((rId== null) ? 0 : rId.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (this.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()))
+            return false;
+        return true;
+    }
 }