BirthdayButlerService: NPE fixed?

micromata · Aug 15, 2023 · 12eb58a · 12eb58a
1 parent b913c69
commit 12eb58a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...ctforge-business/src/main/kotlin/org/projectforge/birthdaybutler/BirthdayButlerService.kt b/...ctforge-business/src/main/kotlin/org/projectforge/birthdaybutler/BirthdayButlerService.kt
@@ -223,8 +223,8 @@ class BirthdayButlerService {
     val foundUsers = mutableListOf<AddressDO>()
     addressList.forEach { address ->
       if (activeUsers.any { user ->
-          address.firstName?.trim().equals(user.firstname?.trim(), ignoreCase = true) &&
-              address.name?.trim().equals(user.lastname?.trim(), ignoreCase = true)
+          address.firstName?.trim()?.equals(user.firstname?.trim(), ignoreCase = true) == true &&
+              address.name?.trim()?.equals(user.lastname?.trim(), ignoreCase = true) == true
         }) {
         foundUsers.add(address)
       }