Merge pull request #274 from woowacourse-teams/release/1.2.0

woowacourse-teams · Sep 16, 2020 · 3667e1b · 3667e1b
2 parents e444989 + d755e46
commit 3667e1b
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/back/src/main/java/sellerlee/back/member/domain/Member.java b/back/src/main/java/sellerlee/back/member/domain/Member.java
@@ -1,5 +1,7 @@
 package sellerlee.back.member.domain;
 
+import java.util.Objects;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
@@ -59,6 +61,9 @@ public boolean isSameId(Member member) {
     }
 
     public boolean isSameNickname(String nickname) {
+        if (Objects.isNull(this.nickname)) {
+            return false;
+        }
         return this.nickname.equals(nickname);
     }