You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2026/04/10 10:27:02 UTC
(camel) branch main updated: CAMEL-23310: camel-core - Suspend/resume on CamelContext should reset… (#22542)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 97089f67e7f3 CAMEL-23310: camel-core - Suspend/resume on CamelContext should reset… (#22542)
97089f67e7f3 is described below
commit 97089f67e7f34f7b1b2635d6ec2c03bcb5b0ab99
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Apr 10 12:26:55 2026 +0200
CAMEL-23310: camel-core - Suspend/resume on CamelContext should reset… (#22542)
* CAMEL-23310: camel-core - Suspend/resume on CamelContext should reset prepare shutdown flag
---
.../main/java/org/apache/camel/jta/TransactionErrorHandler.java | 7 +++++++
.../camel/processor/errorhandler/RedeliveryErrorHandler.java | 7 +++++++
2 files changed, 14 insertions(+)
diff --git a/components/camel-jta/src/main/java/org/apache/camel/jta/TransactionErrorHandler.java b/components/camel-jta/src/main/java/org/apache/camel/jta/TransactionErrorHandler.java
index bdee9c0d97da..f0c2dc19bc43 100644
--- a/components/camel-jta/src/main/java/org/apache/camel/jta/TransactionErrorHandler.java
+++ b/components/camel-jta/src/main/java/org/apache/camel/jta/TransactionErrorHandler.java
@@ -321,6 +321,13 @@ public class TransactionErrorHandler extends ErrorHandlerSupport
preparingShutdown = false;
}
+ @Override
+ protected void doResume() throws Exception {
+ super.doResume();
+ // reset flag when resuming
+ preparingShutdown = false;
+ }
+
@Override
protected void doStop() throws Exception {
// noop, do not stop any services which we only do when shutting down
diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java
index 2c154c122bae..fca8c25ae42d 100644
--- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java
+++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java
@@ -2011,6 +2011,13 @@ public abstract class RedeliveryErrorHandler extends ErrorHandlerSupport
ServiceHelper.startService(taskFactory, output, outputAsync, deadLetter);
}
+ @Override
+ protected void doResume() throws Exception {
+ super.doResume();
+ // reset flag when resuming
+ preparingShutdown = false;
+ }
+
@Override
protected void doShutdown() throws Exception {
ServiceHelper.stopAndShutdownServices(deadLetter, output, outputAsync, taskFactory);