etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

equals() method for ResourceTagResponse
(cherry picked from commit ed73e3e1b3)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
This commit is contained in:
Marcus Sorensen 2014-02-12 17:00:10 -07:00 committed by Animesh Chaturvedi
parent 1c640448df
commit 0ff152258e
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
api/src/org/apache/cloudstack/api/response/ResourceTagResponse.java
View File

@ -102,16 +102,16 @@ public class ResourceTagResponse extends BaseResponse implements ControlledViewE
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 class ResourceTagResponse extends BaseResponse implements ControlledViewE
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;
}