From 76298df0e250fc11e6d1914651c11a8c7dc70f5d Mon Sep 17 00:00:00 2001 From: Rouven Bauer Date: Wed, 9 Mar 2022 09:59:37 +0100 Subject: [PATCH] Fix missing exception conversion in TestKit backend Error was introduced with https://github.com/neo4j/neo4j-java-driver/pull/1154 --- .../backend/messages/requests/SessionReadTransaction.java | 6 ++++-- .../backend/messages/requests/SessionWriteTransaction.java | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionReadTransaction.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionReadTransaction.java index b032547164..350ce7d7f0 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionReadTransaction.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionReadTransaction.java @@ -20,6 +20,7 @@ import lombok.Getter; import lombok.Setter; +import neo4j.org.testkit.backend.FrontendError; import neo4j.org.testkit.backend.TestkitState; import neo4j.org.testkit.backend.holder.AsyncTransactionHolder; import neo4j.org.testkit.backend.holder.RxTransactionHolder; @@ -123,10 +124,11 @@ private TransactionWork handle( TestkitState testkitState, SessionHolder s { throw (Neo4jException) workThrowable; } - else + if ( workThrowable instanceof FrontendError ) { - throw new RuntimeException( "Unexpected exception occurred in transaction work function", workThrowable ); + throw (FrontendError) workThrowable; } + throw new RuntimeException( "Unexpected exception occurred in transaction work function", workThrowable ); } }; } diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionWriteTransaction.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionWriteTransaction.java index 65caff854e..1d0a734ee1 100644 --- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionWriteTransaction.java +++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionWriteTransaction.java @@ -20,6 +20,7 @@ import lombok.Getter; import lombok.Setter; +import neo4j.org.testkit.backend.FrontendError; import neo4j.org.testkit.backend.TestkitState; import neo4j.org.testkit.backend.holder.AsyncTransactionHolder; import neo4j.org.testkit.backend.holder.RxTransactionHolder; @@ -126,10 +127,11 @@ private TransactionWork handle( TestkitState testkitState, SessionHolder s { throw (Neo4jException) workThrowable; } - else + if ( workThrowable instanceof FrontendError ) { - throw new RuntimeException( "Unexpected exception occurred in transaction work function", workThrowable ); + throw (FrontendError) workThrowable; } + throw new RuntimeException( "Unexpected exception occurred in transaction work function", workThrowable ); } }; }