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:26 UTC
[camel] 08/12: CAMEL-15105: move the notify event flag to 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 374d2f30ba4b47066bca98e8bc457b0f2dfa202d
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Wed Apr 26 18:41:01 2023 +0200
CAMEL-15105: move the notify event flag to the extension
---
.../src/main/java/org/apache/camel/support/AbstractExchange.java | 3 +--
.../main/java/org/apache/camel/support/DefaultPooledExchange.java | 2 +-
.../java/org/apache/camel/support/ExtendedExchangeExtension.java | 5 +++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java b/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
index f26711aa6f7..1c204d3444e 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
@@ -73,7 +73,6 @@ class AbstractExchange implements Exchange {
boolean routeStop;
boolean rollbackOnly;
boolean rollbackOnlyLast;
- boolean notifyEvent;
boolean interrupted;
boolean interruptable = true;
AsyncCallback defaultConsumerCallback; // optimize (do not reset)
@@ -148,7 +147,7 @@ class AbstractExchange implements Exchange {
exchange.setRollbackOnly(rollbackOnly);
exchange.setRollbackOnlyLast(rollbackOnlyLast);
final ExtendedExchangeExtension newExchangeExtension = exchange.getExchangeExtension();
- newExchangeExtension.setNotifyEvent(notifyEvent);
+ newExchangeExtension.setNotifyEvent(getExchangeExtension().isNotifyEvent());
newExchangeExtension.setRedeliveryExhausted(getExchangeExtension().isRedeliveryExhausted());
newExchangeExtension.setErrorHandlerHandled(getExchangeExtension().getErrorHandlerHandled());
newExchangeExtension.setStreamCacheDisabled(getExchangeExtension().isStreamCacheDisabled());
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 d80972babd7..f0028d111eb 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
@@ -116,7 +116,7 @@ public final class DefaultPooledExchange extends AbstractExchange implements Poo
this.routeStop = false;
this.rollbackOnly = false;
this.rollbackOnlyLast = false;
- this.notifyEvent = false;
+ getExchangeExtension().setNotifyEvent(false);
this.interrupted = false;
this.interruptable = true;
getExchangeExtension().setRedeliveryExhausted(false);
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 baf4aece5ac..e20fed36bf0 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
@@ -40,6 +40,7 @@ public class ExtendedExchangeExtension implements ExchangeExtension {
private String historyNodeSource;
private String historyNodeLabel;
private boolean transacted;
+ private boolean notifyEvent;
ExtendedExchangeExtension(AbstractExchange exchange) {
this.exchange = exchange;
@@ -170,12 +171,12 @@ public class ExtendedExchangeExtension implements ExchangeExtension {
@Override
public boolean isNotifyEvent() {
- return this.exchange.notifyEvent;
+ return this.notifyEvent;
}
@Override
public void setNotifyEvent(boolean notifyEvent) {
- this.exchange.notifyEvent = notifyEvent;
+ this.notifyEvent = notifyEvent;
}
@Override