rsanchez
2015-01-28 fc256f48aa7e1a378f540fc1fdbde46739ff903c
securis/src/main/java/net/curisit/securis/db/ApplicationMetadata.java
....@@ -20,6 +20,7 @@
2020 import com.fasterxml.jackson.annotation.JsonInclude;
2121 import com.fasterxml.jackson.annotation.JsonInclude.Include;
2222 import com.fasterxml.jackson.annotation.JsonProperty;
23
+import com.google.common.base.Objects;
2324
2425 /**
2526 * Entity implementation class for Entity: application_metadata
....@@ -102,13 +103,13 @@
102103 if (!(obj instanceof ApplicationMetadata))
103104 return false;
104105 ApplicationMetadata other = (ApplicationMetadata) obj;
105
- return key.equals(other.key) && (application == null || application.equals(other.application));
106
+ return Objects.equal(key, other.key) && Objects.equal(application, other.application);
106107 }
107108
108109 @Override
109110 public int hashCode() {
110111
111
- return key.hashCode() + (application == null ? 0 : application.hashCode());
112
+ return (key == null ? 0 : key.hashCode()) + (application == null ? 0 : application.hashCode());
112113 }
113114
114115 @Override