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 2024/01/10 09:25:09 UTC
(camel) branch main updated (b7dc1da4dbe -> d49d680b6e4)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from b7dc1da4dbe CAMEL-20044: formatting fixes
new 489cae42383 CAMEL-20297 camel-jms: do not swallow interrupted exceptions
new d49d680b6e4 CAMEL-20297 camel-sjms: do not swallow interrupted exceptions
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java | 2 +-
.../apache/camel/component/jms/reply/TemporaryQueueReplyManager.java | 3 ++-
.../org/apache/camel/component/sjms/reply/ReplyManagerSupport.java | 2 +-
.../apache/camel/component/sjms/reply/TemporaryQueueReplyManager.java | 1 +
4 files changed, 5 insertions(+), 3 deletions(-)
(camel) 02/02: CAMEL-20297 camel-sjms: do not swallow interrupted exceptions
Posted by or...@apache.org.
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 d49d680b6e48ea0a345d878113a07ddfdf3ff247
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Wed Jan 10 09:34:15 2024 +0100
CAMEL-20297 camel-sjms: do not swallow interrupted exceptions
---
.../java/org/apache/camel/component/sjms/reply/ReplyManagerSupport.java | 2 +-
.../apache/camel/component/sjms/reply/TemporaryQueueReplyManager.java | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/ReplyManagerSupport.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/ReplyManagerSupport.java
index 42219a2fb94..18b05d58fa0 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/ReplyManagerSupport.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/ReplyManagerSupport.java
@@ -104,7 +104,7 @@ public abstract class ReplyManagerSupport extends ServiceSupport implements Repl
log.trace("Waiting for replyTo to be set done");
}
} catch (InterruptedException e) {
- // ignore
+ Thread.currentThread().interrupt();
}
return replyTo;
}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/TemporaryQueueReplyManager.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/TemporaryQueueReplyManager.java
index eadbd23869f..6c3ce420c1e 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/TemporaryQueueReplyManager.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/reply/TemporaryQueueReplyManager.java
@@ -46,6 +46,7 @@ public class TemporaryQueueReplyManager extends ReplyManagerSupport {
destResolver.destinationReady();
} catch (InterruptedException e) {
log.warn("Interrupted while waiting for JMSReplyTo destination refresh", e);
+ Thread.currentThread().interrupt();
}
return super.getReplyTo();
}
(camel) 01/02: CAMEL-20297 camel-jms: do not swallow interrupted exceptions
Posted by or...@apache.org.
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 489cae4238349dedc24b7303ea644c9835881e12
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Wed Jan 10 09:34:09 2024 +0100
CAMEL-20297 camel-jms: do not swallow interrupted exceptions
---
.../java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java | 2 +-
.../apache/camel/component/jms/reply/TemporaryQueueReplyManager.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java
index 9a81edc48ea..88877970b99 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java
@@ -113,7 +113,7 @@ public abstract class ReplyManagerSupport extends ServiceSupport implements Repl
log.trace("Waiting for replyTo to be set done");
}
} catch (InterruptedException e) {
- // ignore
+ Thread.currentThread().interrupt();
}
return replyTo;
}
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java
index ec1e0a61178..2557f14e9e9 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java
@@ -53,8 +53,9 @@ public class TemporaryQueueReplyManager extends ReplyManagerSupport {
try {
destResolver.destinationReady();
} catch (InterruptedException e) {
- log.warn("Interrupted while waiting for JMSReplyTo destination refresh due to: {}. This exception is ignored.",
+ log.warn("Interrupted while waiting for JMSReplyTo destination refresh due to: {}.",
e.getMessage());
+ Thread.currentThread().interrupt();
}
return super.getReplyTo();
}