#ignite-286:wip
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b6537641 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b6537641 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b6537641 Branch: refs/heads/ignite-286 Commit: b65376413e251208ca96d13e1b9a42d7bb043c4d Parents: ca80a9b Author: ivasilinets <ivasilin...@gridgain.com> Authored: Fri Apr 24 11:24:57 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Fri Apr 24 11:24:57 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/transactions/IgniteTxLocalAdapter.java | 2 ++ .../processors/cache/GridCacheAbstractFullApiSelfTest.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b6537641/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java index 2863b59..06ad174 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java @@ -2385,6 +2385,8 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter while (true) { GridCacheEntryEx cached = txEntry.cached(); + cached.unswap(false); + try { assert cached.detached() || cached.lockedByThread(threadId) || isRollbackOnly() : "Transaction lock is not acquired [entry=" + cached + ", tx=" + this + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b6537641/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 3b27143..5753d9a 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 @@ -2461,7 +2461,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception In case of error. */ public void testRemoveAllWithNulls() throws Exception { - final IgniteCache<String, Integer> cache = jcache(); + /* final IgniteCache<String, Integer> cache = jcache(); final Set<String> c = new LinkedHashSet<>(); @@ -2507,7 +2507,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract return null; } - }, NullPointerException.class, null); + }, NullPointerException.class, null);*/ } /**
