This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch sandbox/camel-3.x in repository https://gitbox.apache.org/repos/asf/camel.git
commit b323687cd6e1ab4fd98934024e4a801400552817 Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Mon Dec 10 08:24:30 2018 +0100 CAMEL-12985 - Fixed CS --- .../org/apache/camel/spring/spi/TransactionErrorHandler.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java index 4f493b5..8cc2c72 100644 --- a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java +++ b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java @@ -95,7 +95,9 @@ public class TransactionErrorHandler extends RedeliveryErrorHandler { public void process(Exchange exchange) { // we have to run this synchronously as Spring Transaction does *not* support // using multiple threads to span a transaction - if (transactionTemplate.getPropagationBehavior() != TransactionDefinition.PROPAGATION_REQUIRES_NEW && exchange.getUnitOfWork() != null && exchange.getUnitOfWork().isTransactedBy(transactionKey)) { + if (transactionTemplate.getPropagationBehavior() != TransactionDefinition.PROPAGATION_REQUIRES_NEW + && exchange.getUnitOfWork() != null + && exchange.getUnitOfWork().isTransactedBy(transactionKey)) { // already transacted by this transaction template // so lets just let the error handler process it processByErrorHandler(exchange); @@ -129,8 +131,9 @@ public class TransactionErrorHandler extends RedeliveryErrorHandler { try { // mark the beginning of this transaction boundary - if (exchange.getUnitOfWork() != null) + if (exchange.getUnitOfWork() != null) { exchange.getUnitOfWork().beginTransactedBy(transactionKey); + } // do in transaction logTransactionBegin(redelivered, ids); @@ -145,8 +148,9 @@ public class TransactionErrorHandler extends RedeliveryErrorHandler { logTransactionRollback(redelivered, ids, e, false); } finally { // mark the end of this transaction boundary - if (exchange.getUnitOfWork() != null) + if (exchange.getUnitOfWork() != null) { exchange.getUnitOfWork().endTransactedBy(transactionKey); + } } // if it was a local rollback only then remove its marker so outer transaction wont see the marker