IGNITE-9655 Merge fixes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0e50dbdd Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0e50dbdd Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0e50dbdd Branch: refs/heads/sprint-1 Commit: 0e50dbdd2a3c1a235e50e3ef200bd54567ebcfb7 Parents: 3728ac3 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Thu Feb 12 15:22:25 2015 -0800 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Thu Feb 12 15:22:25 2015 -0800 ---------------------------------------------------------------------- .../internal/processors/cache/transactions/IgniteTxManager.java | 2 +- .../processors/cache/GridCacheAbstractFullApiSelfTest.java | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0e50dbdd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java index 87708ed..bf8f855 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java @@ -893,7 +893,7 @@ public class IgniteTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V> { * @param tx Transaction. */ private void removeObsolete(IgniteInternalTx<K, V> tx) { - Collection<IgniteTxEntry<K, V>> entries = (tx.local() && !tx.dht()) ? tx.allEntries() : tx.writeEntries(); + Collection<IgniteTxEntry<K, V>> entries = tx.local() ? tx.allEntries() : tx.writeEntries(); for (IgniteTxEntry<K, V> entry : entries) { GridCacheEntryEx<K, V> cached = entry.cached(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0e50dbdd/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java index 6b21114..6f3c1f9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java @@ -3819,9 +3819,6 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract checkIteratorRemove(cache, entries); checkIteratorEmpty(cache); - - for (int i = 0; i < SIZE; i++) - cache.remove(Integer.toString(i)); } /**
