You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/03/29 16:27:55 UTC
[3/4] ignite git commit: ignite-3477-master fix testLocalTransactional
ignite-3477-master fix testLocalTransactional
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/48e71237
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/48e71237
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/48e71237
Branch: refs/heads/ignite-3477-master
Commit: 48e712377ee48da2b84fbf7f58e2b5a2430ebdc8
Parents: d0a5930
Author: Dmitriy Govorukhin <dg...@gridgain.com>
Authored: Wed Mar 29 15:36:17 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Wed Mar 29 19:26:19 2017 +0300
----------------------------------------------------------------------
.../internal/processors/cache/transactions/IgniteTxManager.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/48e71237/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 dc70a98..2c46d52 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
@@ -1564,6 +1564,8 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter {
boolean read = serOrder != null && txEntry1.op() == READ;
+ entry1.unswap();
+
if (!entry1.tmLock(tx, timeout, serOrder, serReadVer, read)) {
// Unlock locks locked so far.
for (IgniteTxEntry txEntry2 : entries) {