[mina-sshd] 02/05: More robust NULL handling in GenericMapPopulator

[lgoldstein]

This is an automated email from the ASF dual-hosted git repository.

lgoldstein pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git

commit e10fbc42a5be6bd99d5e33447380323874f0f846
Author: Lyor Goldstein <lgoldst...@apache.org>
AuthorDate: Fri Nov 19 10:13:45 2021 +0200

    More robust NULL handling in GenericMapPopulator
---
 .../src/main/java/org/apache/sshd/common/util/MapEntryUtils.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git 
a/sshd-common/src/main/java/org/apache/sshd/common/util/MapEntryUtils.java 
b/sshd-common/src/main/java/org/apache/sshd/common/util/MapEntryUtils.java
index 0258332..e2882ad 100644
--- a/sshd-common/src/main/java/org/apache/sshd/common/util/MapEntryUtils.java
+++ b/sshd-common/src/main/java/org/apache/sshd/common/util/MapEntryUtils.java
@@ -72,7 +72,10 @@ public final class MapEntryUtils {
         }
 
         public GenericMapPopulator<K, V, M> put(K k, V v) {
-            map.put(k, v);
+            if (v == null) {
+                return remove(k);
+            }
+            map.put(Objects.requireNonNull(k, "No key provided"), v);
             return this;
         }
 
@@ -82,7 +85,9 @@ public final class MapEntryUtils {
         }
 
         public GenericMapPopulator<K, V, M> putAll(Map<? extends K, ? extends 
V> other) {
-            map.putAll(other);
+            if (isNotEmpty(other)) {
+                other.forEach(this::put);
+            }
             return this;
         }