Fix NPE in DefaultMessageFactory if receiving unknown message type > 32

belaban · Apr 24, 2024 · ceca494 · ceca494
1 parent b59333e
commit ceca494
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/src/org/jgroups/DefaultMessageFactory.java b/src/org/jgroups/DefaultMessageFactory.java
@@ -14,7 +14,7 @@
 public class DefaultMessageFactory implements MessageFactory {
     protected static final byte                      MIN_TYPE=32;
     protected final Supplier<? extends Message>[]    creators=new Supplier[MIN_TYPE];
-    protected Map<Short,Supplier<? extends Message>> map;
+    protected Map<Short,Supplier<? extends Message>> map=new HashMap<>();
 
     public DefaultMessageFactory() {
         creators[Message.BYTES_MSG]=BytesMessage::new;
@@ -38,8 +38,6 @@ public <T extends MessageFactory> T register(short type, Supplier<? extends Mess
         Objects.requireNonNull(generator, "the creator must be non-null");
         if(type < MIN_TYPE)
             throw new IllegalArgumentException(String.format("type (%d) must be >= 32", type));
-        if(map == null)
-            map=new HashMap<>();
         if(map.containsKey(type))
             throw new IllegalArgumentException(String.format("type %d is already taken", type));
         map.put(type, generator);