[UPD] Fix NullPointerException thrown when comparing TaskTypes for eq…

…uality.
kbss-cvut · Nov 1, 2023 · 5662348 · 5662348
1 parent cd11c7e
commit 5662348
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/aircraft-maintenance-planning/src/main/java/cz/cvut/kbss/amaplas/model/TaskType.java b/aircraft-maintenance-planning/src/main/java/cz/cvut/kbss/amaplas/model/TaskType.java
@@ -258,7 +258,17 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (!(o instanceof TaskType)) return false;
         TaskType taskType = (TaskType) o;
-        return getCode().equals(taskType.getCode());
+
+        if(getEntityURI() != null)
+            return getEntityURI().equals(taskType.getEntityURI());
+        if(taskType.getEntityURI() != null)
+            return taskType.getEntityURI().equals(getEntityURI());
+        if(getCode() != null)
+            return getCode().equals(taskType.getCode());
+        if(taskType.getCode() != null)
+            return taskType.getCode().equals(getCode());
+
+        return false;
     }
 
     @Override