Repository: ignite Updated Branches: refs/heads/ignite-4932 eac29c089 -> 9141e2927
ignite-4932 WIP Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9141e292 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9141e292 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9141e292 Branch: refs/heads/ignite-4932 Commit: 9141e2927d41e91fc5e921451a1bfcbc53da78d9 Parents: eac29c0 Author: sboikov <[email protected]> Authored: Thu Apr 13 11:26:31 2017 +0300 Committer: sboikov <[email protected]> Committed: Thu Apr 13 11:26:31 2017 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/colocated/GridDhtColocatedCache.java | 3 +++ .../processors/cache/local/atomic/GridLocalAtomicCache.java | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9141e292/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java index 4b1dd9e..19e001f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java @@ -468,6 +468,9 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte long expireTime = swapEntry.expireTime(); if (expireTime == 0 || expireTime < U.currentTimeMillis()) { + if (locVals == null) + locVals = U.newHashMap(keys.size()); + ctx.addResult(locVals, key, swapEntry.value(), http://git-wip-us.apache.org/repos/asf/ignite/blob/9141e292/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java index 1f66fdf..04048af 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java @@ -22,7 +22,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; @@ -390,7 +389,7 @@ public class GridLocalAtomicCache<K, V> extends GridLocalCache<K, V> { UUID subjId = ctx.subjectIdPerCall(null, opCtx); - Map<K, V> vals = new HashMap<>(keys.size(), 1.0f); + Map<K, V> vals = U.newHashMap(keys.size()); if (keyCheck) validateCacheKeys(keys);
