R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make CanonizingStringMap not crash on null keys/values

Browse Source
This commit is contained in:
embeddedt 2023-05-31 09:37:34 -04:00
parent 76485b0cba
commit b15537a32f
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/main/java/org/embeddedt/modernfix/util/CanonizingStringMap.java
View File

@ -141,6 +141,7 @@ public class CanonizingStringMap<T> implements Map<String, T> {
}
public static <T> CanonizingStringMap<T> deepCopy(CanonizingStringMap<T> inputMap, Function<T, T> deepCopier) {
Objects.requireNonNull(deepCopier);
Object2ObjectMap<String, T> copiedBackingMap;
int size = inputMap.backingMap.size();
if(size > GROWTH_THRESHOLD) {
@ -148,7 +149,8 @@ public class CanonizingStringMap<T> implements Map<String, T> {
} else
copiedBackingMap = new Object2ObjectArrayMap<>(size);
inputMap.backingMap.object2ObjectEntrySet().forEach(entry -> {
copiedBackingMap.put(entry.getKey(), deepCopier.apply(entry.getValue()));
if(entry.getKey() != null && entry.getValue() != null)
copiedBackingMap.put(entry.getKey(), deepCopier.apply(entry.getValue()));
});
return new CanonizingStringMap<>(copiedBackingMap);
}