feedc0de/LogBlock
1
0
Fork 0
forked from LogBlock/LogBlock
Code Pull Requests Activity

getExistingEntityTypeId should return Integer instead of int

Browse Source 
Fixes #804
This commit is contained in:
Brokkonaut
2020-08-31 00:28:12 +02:00
parent d548206c3a
commit 42715de265
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/diddiz/LogBlock/EntityTypeConverter.java
View File

@@ -16,7 +16,7 @@ public class EntityTypeConverter {
private static HashMap<EntityType, Integer> entityTypeToId = new HashMap<>(); private static HashMap<EntityType, Integer> entityTypeToId = new HashMap<>();
private static int nextEntityTypeId; private static int nextEntityTypeId;
public synchronized static int getExistingEntityTypeId(EntityType entityType) { public synchronized static Integer getExistingEntityTypeId(EntityType entityType) {
return entityType == null ? null : entityTypeToId.get(entityType); return entityType == null ? null : entityTypeToId.get(entityType);
} }

5
src/main/java/de/diddiz/LogBlock/QueryParams.java
View File

@@ -1043,8 +1043,9 @@ public final class QueryParams implements Cloneable {
private Set<Integer> getEntityTypeIds() { private Set<Integer> getEntityTypeIds() {
HashSet<Integer> typeIds = new HashSet<>(); HashSet<Integer> typeIds = new HashSet<>();
for (EntityType type : entityTypes) { for (EntityType type : entityTypes) {
if (type != null) { Integer id = EntityTypeConverter.getExistingEntityTypeId(type);
typeIds.add(EntityTypeConverter.getExistingEntityTypeId(type)); if (id != null) {
typeIds.add(id);
} }
} }
// add invalid id, so the type list is not ignored // add invalid id, so the type list is not ignored