zet/sasiedzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix nullpointer

Browse Source
This commit is contained in:
Sławek Zatorski
2024-12-16 22:59:05 +01:00
parent 04df2ee1aa
commit cd9752090f
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/sasiedzi/event/domain/TransactionItemComparator.java
+2 -1
View File
@@ -1,6 +1,7 @@
package com.sasiedzi.event.domain; package com.sasiedzi.event.domain;
import java.util.Comparator; import java.util.Comparator;
import java.util.Objects;
public class TransactionItemComparator implements Comparator<TransactionItem> { public class TransactionItemComparator implements Comparator<TransactionItem> {
@@ -11,7 +12,7 @@ public class TransactionItemComparator implements Comparator<TransactionItem> {
if (item1 == null && item2 == null) return 0; if (item1 == null && item2 == null) return 0;
if (item1 == null) return -1; if (item1 == null) return -1;
if (item2 == null) return 1; if (item2 == null) return 1;
if (item1.getId().equals(item2.getId())) return 0; if (Objects.equals(item1.getId(), item2.getId())) return 0;
// Teraz porównujemy pola userAccount // Teraz porównujemy pola userAccount
return compareUserAccounts(item1.getUserAccount(), item2.getUserAccount()); return compareUserAccounts(item1.getUserAccount(), item2.getUserAccount());
src/main/java/com/sasiedzi/event/domain/UserAccountComparator.java
+2 -1
View File
@@ -4,6 +4,7 @@ import com.sasiedzi.event.service.Account;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Comparator; import java.util.Comparator;
import java.util.Objects;
public class UserAccountComparator implements Comparator<UserAccount> { public class UserAccountComparator implements Comparator<UserAccount> {
@@ -22,7 +23,7 @@ public class UserAccountComparator implements Comparator<UserAccount> {
if (ua1 == null && ua2 == null) return 0; if (ua1 == null && ua2 == null) return 0;
if (ua1 == null) return -1; if (ua1 == null) return -1;
if (ua2 == null) return 1; if (ua2 == null) return 1;
if (ua1.getId().equals(ua2.getId())) return 0; if (Objects.equals(ua1.getId(), ua2.getId())) return 0;
String name1 = ua1.getName(); String name1 = ua1.getName();
String name2 = ua2.getName(); String name2 = ua2.getName();