From 566234843e56a196a2a7dc33f278a5c9e63cac6a Mon Sep 17 00:00:00 2001 From: Bogdan Kostov Date: Wed, 1 Nov 2023 17:17:45 +0100 Subject: [PATCH] [UPD] Fix NullPointerException thrown when comparing TaskTypes for equality. --- .../java/cz/cvut/kbss/amaplas/model/TaskType.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 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 index 1aaa517..f47dcfc 100644 --- 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