You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2023/04/26 17:58:30 UTC
[camel] 12/12: CAMEL-15105: cleaned up resetting the extension
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1e7715192a013e5d554d7c8b9e6ae582dface65c
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Wed Apr 26 19:07:50 2023 +0200
CAMEL-15105: cleaned up resetting the extension
---
.../java/org/apache/camel/support/DefaultPooledExchange.java | 11 ++---------
.../org/apache/camel/support/ExtendedExchangeExtension.java | 12 ++++++++++++
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java b/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java
index 5b0dbc2795f..21ac295a2b7 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/DefaultPooledExchange.java
@@ -110,18 +110,11 @@ public final class DefaultPooledExchange extends AbstractExchange implements Poo
}
// do not reset endpoint/fromRouteId as it would be the same consumer/endpoint again
this.externalRedelivered = null;
- getExchangeExtension().setHistoryNodeId(null);
- getExchangeExtension().setHistoryNodeLabel(null);
- getExchangeExtension().setTransacted(false);
this.routeStop = false;
this.rollbackOnly = false;
this.rollbackOnlyLast = false;
- getExchangeExtension().setNotifyEvent(false);
- getExchangeExtension().setInterrupted(false);
- getExchangeExtension().setInterruptable(true);
- getExchangeExtension().setRedeliveryExhausted(false);
- getExchangeExtension().setErrorHandlerHandled(null);
- getExchangeExtension().setStreamCacheDisabled(false);
+
+ getExchangeExtension().reset();
if (onDone != null) {
onDone.onDone(this);
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java b/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
index 5265a008cd0..8080af78e0c 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
@@ -252,4 +252,16 @@ public class ExtendedExchangeExtension implements ExchangeExtension {
public void setFailureHandled(boolean failureHandled) {
this.failureHandled = failureHandled;
}
+
+ public void reset() {
+ setHistoryNodeId(null);
+ setHistoryNodeLabel(null);
+ setTransacted(false);
+ setNotifyEvent(false);
+ setInterrupted(false);
+ setInterruptable(true);
+ setRedeliveryExhausted(false);
+ setErrorHandlerHandled(null);
+ setStreamCacheDisabled(false);
+ }
}