Commit af1524b2ea0d44250ab1987c62047a27e20eb394
1 parent
722727e0
Fix NPE in TbMsgMetaData constructor.
Showing
1 changed file
with
4 additions
and
2 deletions
@@ -34,7 +34,7 @@ public final class TbMsgMetaData implements Serializable { | @@ -34,7 +34,7 @@ public final class TbMsgMetaData implements Serializable { | ||
34 | private final Map<String, String> data = new ConcurrentHashMap<>(); | 34 | private final Map<String, String> data = new ConcurrentHashMap<>(); |
35 | 35 | ||
36 | public TbMsgMetaData(Map<String, String> data) { | 36 | public TbMsgMetaData(Map<String, String> data) { |
37 | - this.data.putAll(data); | 37 | + data.forEach((key, val) -> putValue(key, val)); |
38 | } | 38 | } |
39 | 39 | ||
40 | public String getValue(String key) { | 40 | public String getValue(String key) { |
@@ -42,7 +42,9 @@ public final class TbMsgMetaData implements Serializable { | @@ -42,7 +42,9 @@ public final class TbMsgMetaData implements Serializable { | ||
42 | } | 42 | } |
43 | 43 | ||
44 | public void putValue(String key, String value) { | 44 | public void putValue(String key, String value) { |
45 | - data.put(key, value); | 45 | + if (key != null && value != null) { |
46 | + data.put(key, value); | ||
47 | + } | ||
46 | } | 48 | } |
47 | 49 | ||
48 | public Map<String, String> values() { | 50 | public Map<String, String> values() { |