Repository: ignite Updated Branches: refs/heads/ignite-950-new 6037685c1 -> acbac6a88
IGNITE-950-new - Fixed tests. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/acbac6a8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/acbac6a8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/acbac6a8 Branch: refs/heads/ignite-950-new Commit: acbac6a883caf9e40e5c8eac184e657151573b5c Parents: 6037685 Author: Alexey Goncharuk <[email protected]> Authored: Mon Nov 2 10:03:38 2015 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Mon Nov 2 10:03:38 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheConcurrentMap.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/acbac6a8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java index 2e37eda..98dcc18 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java @@ -1878,7 +1878,7 @@ public class GridCacheConcurrentMap { * @return Key iterator. */ Iterator<K> keyIterator() { - return new KeyIterator<>(map, opCtxPerCall.isKeepPortable(), filter); + return new KeyIterator<>(map, opCtxPerCall != null && opCtxPerCall.isKeepPortable(), filter); } /**
