From 87e7055673ee1386fb32d4161bc9c04061182af9 Mon Sep 17 00:00:00 2001
From: fickludd <johan.teleman@neotechnology.com>
Date: Fri, 2 Feb 2018 13:27:32 +0100
Subject: [PATCH] Optimized
 ThreadToStatementContextBridge.assertInUnterminatedTransaction

---
 .../kernel/impl/core/ThreadToStatementContextBridge.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/ThreadToStatementContextBridge.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/ThreadToStatementContextBridge.java
index 7ae2a5a5a55fb..022326f9688b1 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/core/ThreadToStatementContextBridge.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/core/ThreadToStatementContextBridge.java
@@ -72,11 +72,11 @@ private static void assertInUnterminatedTransaction( KernelTransaction transacti
         {
             throw new BridgeNotInTransactionException();
         }
-        Optional<Status> terminationReason = transaction.getReasonIfTerminated();
-        terminationReason.ifPresent( status ->
+        if ( transaction.isTerminated() )
         {
-            throw new TransactionTerminatedException( status );
-        } );
+            Status terminationReason = transaction.getReasonIfTerminated().orElse( Status.Transaction.Terminated );
+            throw new TransactionTerminatedException( terminationReason );
+        }
     }
 
     public void assertInUnterminatedTransaction()