Optimized ThreadToStatementContextBridge.assertInUnterminatedTransaction

neo4j · Mar 1, 2018 · 87e7055 · 87e7055
1 parent 582ba0f
commit 87e7055
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/...unity/kernel/src/main/java/org/neo4j/kernel/impl/core/ThreadToStatementContextBridge.java b/...unity/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();
+        if ( transaction.isTerminated() )
-        terminationReason.ifPresent( status ->
         {
-            throw new TransactionTerminatedException( status );
+            Status terminationReason = transaction.getReasonIfTerminated().orElse( Status.Transaction.Terminated );
-        } );
+            throw new TransactionTerminatedException( terminationReason );
+        }
     }
 
     public void assertInUnterminatedTransaction()