From ada8fc9cb664e70f975312007f9d5003ca6a82b0 Mon Sep 17 00:00:00 2001
From: Anton Kalashnikov <kaa.dev@yandex.ru>
Date: Mon, 3 Dec 2018 16:49:24 +0300
Subject: [PATCH] IGNITE-10509 reordered setting of timeout flag and
 transaction state

---
 .../processors/cache/transactions/IgniteTxAdapter.java        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 c8b04593a04fd..47a02767ca2c3 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 @@ protected final boolean state(TransactionState state, boolean timedOut) {
             }
 
             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 + ']');