Merge pull request eugenp#12197 from eugenp/BAEL-5420-v2

BAEL-5420 fix equals method
zdougherty-softwarfare · May 11, 2022 · 2f165c9 · 2f165c9
2 parents fa64770 + 3d706a4
commit 2f165c9
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/core-java-modules/core-java-lang-4/src/main/java/com/baeldung/employee/EmployeeVO.java b/core-java-modules/core-java-lang-4/src/main/java/com/baeldung/employee/EmployeeVO.java
@@ -28,9 +28,15 @@ public LocalDate getStartDate() {
 
     @Override
     public boolean equals(Object obj) {
-        return Objects.equals(firstName, this.firstName)
-            && Objects.equals(lastName, this.lastName)
-            && Objects.equals(startDate, this.startDate);
+
+        if (this == obj) return true;
+        if (obj == null || getClass() != obj.getClass()) return false;
+
+        EmployeeVO emp = (EmployeeVO) obj;
+
+        return Objects.equals(firstName, emp.firstName)
+            && Objects.equals(lastName, emp.lastName)
+            && Objects.equals(startDate, emp.startDate);
     }
 
     @Override