You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dg...@apache.org on 2018/12/05 13:30:45 UTC
ignite git commit: IGNITE-10509 reordered setting of timeout flag and
transaction state - Fixes #5555.
Repository: ignite
Updated Branches:
refs/heads/master bc895ac62 -> 5fa79c6a1
IGNITE-10509 reordered setting of timeout flag and transaction state - Fixes #5555.
Signed-off-by: Dmitriy Govorukhin <dm...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5fa79c6a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5fa79c6a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5fa79c6a
Branch: refs/heads/master
Commit: 5fa79c6a134b9530e0055eddcb90b53ce3d768bc
Parents: bc895ac
Author: Anton Kalashnikov <ka...@yandex.ru>
Authored: Wed Dec 5 16:30:16 2018 +0300
Committer: Dmitriy Govorukhin <dm...@gmail.com>
Committed: Wed Dec 5 16:30:16 2018 +0300
----------------------------------------------------------------------
.../internal/processors/cache/transactions/IgniteTxAdapter.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/5fa79c6a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
index c8b0459..47a0276 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
@@ -1185,11 +1185,11 @@ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter implement
}
if (valid) {
- this.state = state;
-
if (timedOut)
this.timedOut = true;
+ this.state = state;
+
if (log.isDebugEnabled())
log.debug("Changed transaction state [prev=" + prev + ", new=" + this.state + ", tx=" + this + ']');