ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject [08/34] ignite git commit: ignite-3477-master fix testLocalTransactional
Date Thu, 30 Mar 2017 17:25:18 GMT
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/9c89b9b3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9c89b9b3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9c89b9b3

Branch: refs/heads/ignite-3477-master
Commit: 9c89b9b3a7f1acc8123477cacc481f6fedf91cf6
Parents: 6c6a9a3
Author: Dmitriy Govorukhin <dgovorukhin@gridgain.com>
Authored: Wed Mar 29 15:36:17 2017 +0300
Committer: Dmitriy Govorukhin <dgovorukhin@gridgain.com>
Committed: Wed Mar 29 15:36:17 2017 +0300

----------------------------------------------------------------------
 .../internal/processors/cache/transactions/IgniteTxManager.java    | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/9c89b9b3/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) {


Mime
View raw message