From 855034570ec6913e868bddbbc1c6e2913823fe1d Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Tue, 30 Mar 2021 20:14:51 +0200 Subject: [PATCH] [Fix] Fixed NPE in MapOfLists and MapOfSets size(T) --- .../src/main/java/li/strolch/utils/collections/MapOfLists.java | 2 +- .../src/main/java/li/strolch/utils/collections/MapOfSets.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/collections/MapOfLists.java b/li.strolch.utils/src/main/java/li/strolch/utils/collections/MapOfLists.java index 543a15dec..a56dab935 100644 --- a/li.strolch.utils/src/main/java/li/strolch/utils/collections/MapOfLists.java +++ b/li.strolch.utils/src/main/java/li/strolch/utils/collections/MapOfLists.java @@ -117,7 +117,7 @@ public class MapOfLists { public int size(T t) { List list = this.mapOfLists.get(t); - if (list.size() == 0) + if (list == null || list.size() == 0) return 0; return list.size(); } diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/collections/MapOfSets.java b/li.strolch.utils/src/main/java/li/strolch/utils/collections/MapOfSets.java index fef9328f9..ccb1f7ee4 100644 --- a/li.strolch.utils/src/main/java/li/strolch/utils/collections/MapOfSets.java +++ b/li.strolch.utils/src/main/java/li/strolch/utils/collections/MapOfSets.java @@ -135,7 +135,7 @@ public class MapOfSets { public int size(T t) { Set set = this.mapOfSets.get(t); - if (set.size() == 0) + if (set == null || set.size() == 0) return 0; return set.size(); }