ignite-1526: fixed merging conflicts
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6afc2fc3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6afc2fc3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6afc2fc3 Branch: refs/heads/ignite-843 Commit: 6afc2fc3ca390dad7834105b53804b89f50aecf2 Parents: 5fc682f Author: Andrey Gura <ag...@gridgain.com> Authored: Fri Oct 9 14:23:34 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Fri Oct 9 14:23:34 2015 +0300 ---------------------------------------------------------------------- .../testframework/junits/multijvm/IgniteCacheProcessProxy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6afc2fc3/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java index 04d7893..02c6a26 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java @@ -553,7 +553,7 @@ public class IgniteCacheProcessProxy<K, V> implements IgniteCache<K, V> { Collection<Entry<K, V>> res = new ArrayList<>(); for (Entry<K, V> e : cache().localEntries(peekModes)) - res.add(new CacheEntryImpl<>(e.getKey(), e.getValue())); + res.add(e); return res; }