some fields are finalized; equals() improvements

1 files changed, 4 insertions, 3 deletions

diff --git a/juick-core/src/main/java/com/juick/User.java b/juick-core/src/main/java/com/juick/User.java
index a8109e50..b8936bab 100644
--- a/juick-core/src/main/java/com/juick/User.java
+++ b/juick-core/src/main/java/com/juick/User.java
@@ -21,11 +21,9 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
- *
  * @author Ugnich Anton
  */
 public class User {
-
     private int UID = 0;
     private String UName = null;
     @JsonIgnore
@@ -53,7 +51,8 @@ public class User {
 
     @Override
     public boolean equals(Object obj) {
-        return (obj instanceof User && ((User) obj).getUID() == this.getUID());
+        return obj == this ||
+                (obj instanceof User && ((User) obj).getUID() == this.getUID());
     }
 
     @JsonProperty("uid")
@@ -100,10 +99,12 @@ public class User {
     public void setAuthHash(String authHash) {
         AuthHash = authHash;
     }
+
     @JsonProperty("unreadCount")
     public Integer getUnreadCount() {
         return MessagesCount;
     }
+
     public void setUnreadCount(Integer count) {
         MessagesCount = count;
     }