This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit 187ab82ea76ef51f4de1dd9d298a56a36ef71795 Author: Claus Ibsen <[email protected]> AuthorDate: Mon Jan 27 13:32:45 2020 +0100 CAMEL-14354: camel-core optimize --- .../src/main/java/org/apache/camel/support/ExchangeHelper.java | 4 +++- .../src/main/java/org/apache/camel/support/UnitOfWorkHelper.java | 4 ---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/core/camel-support/src/main/java/org/apache/camel/support/ExchangeHelper.java b/core/camel-support/src/main/java/org/apache/camel/support/ExchangeHelper.java index 46a9105..b2bd26a 100644 --- a/core/camel-support/src/main/java/org/apache/camel/support/ExchangeHelper.java +++ b/core/camel-support/src/main/java/org/apache/camel/support/ExchangeHelper.java @@ -255,7 +255,9 @@ public final class ExchangeHelper { copy.getIn().setMessageId(null); } // do not share the unit of work - copy.adapt(ExtendedExchange.class).setUnitOfWork(null); + ExtendedExchange ee = (ExtendedExchange) exchange; + ee.setUnitOfWork(null); + // do not reuse the message id // hand over on completion to the copy if we got any UnitOfWork uow = exchange.getUnitOfWork(); diff --git a/core/camel-support/src/main/java/org/apache/camel/support/UnitOfWorkHelper.java b/core/camel-support/src/main/java/org/apache/camel/support/UnitOfWorkHelper.java index d6405fd..7c03036 100644 --- a/core/camel-support/src/main/java/org/apache/camel/support/UnitOfWorkHelper.java +++ b/core/camel-support/src/main/java/org/apache/camel/support/UnitOfWorkHelper.java @@ -63,10 +63,6 @@ public final class UnitOfWorkHelper { LOG.warn("Exception occurred during stopping UnitOfWork for Exchange: " + exchange + ". This exception will be ignored.", e); } - - // remove uow from exchange as its done - ExtendedExchange ee = (ExtendedExchange) exchange; - ee.setUnitOfWork(null); } public static void doneSynchronizations(Exchange exchange, List<Synchronization> synchronizations, Logger log) {
