Null argument check for cache.putAll. (cherry picked from commit c0f1a21)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e82eefe7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e82eefe7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e82eefe7 Branch: refs/heads/master Commit: e82eefe7a7d7f541e6d2fc4b166843b87ec9ef87 Parents: 09c634e Author: sboikov <[email protected]> Authored: Tue Dec 20 12:35:51 2016 +0300 Committer: sboikov <[email protected]> Committed: Tue Dec 20 13:21:28 2016 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/processors/cache/GridCacheAdapter.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e82eefe7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index 8187e8f..f235f6a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -2661,6 +2661,8 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V /** {@inheritDoc} */ @Override public void putAll(@Nullable final Map<? extends K, ? extends V> m) throws IgniteCheckedException { + A.notNull(m, "map"); + if (F.isEmpty(m)) return;
