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/12 14:46:29 UTC
(camel) 01/06: CAMEL-20297 camel-google-pubsub: do not swallow interrupted exceptions
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 62f71e2ef108674f5af48a293e5d9f8736a24d85
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Fri Jan 12 10:48:54 2024 +0100
CAMEL-20297 camel-google-pubsub: do not swallow interrupted exceptions
---
.../apache/camel/component/google/pubsub/GooglePubsubComponent.java | 3 +++
.../org/apache/camel/component/google/pubsub/GooglePubsubConsumer.java | 3 +++
2 files changed, 6 insertions(+)
diff --git a/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubComponent.java b/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubComponent.java
index 57ca6ff825e..2dcb1ddfb34 100644
--- a/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubComponent.java
+++ b/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubComponent.java
@@ -107,6 +107,9 @@ public class GooglePubsubComponent extends DefaultComponent {
publisher.shutdown();
try {
publisher.awaitTermination(publisherTerminationTimeout, TimeUnit.MILLISECONDS);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ throw new RuntimeCamelException(e);
} catch (Exception e) {
throw new RuntimeCamelException(e);
}
diff --git a/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubConsumer.java b/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubConsumer.java
index 1d9d5012360..6a7172782b4 100644
--- a/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubConsumer.java
+++ b/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubConsumer.java
@@ -140,6 +140,9 @@ public class GooglePubsubConsumer extends DefaultConsumer {
}
localLog.debug("Exit run for subscription {}", subscriptionName);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ localLog.error("Failure getting messages from PubSub", e);
} catch (Exception e) {
localLog.error("Failure getting messages from PubSub", e);
}