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/11 16:55:29 UTC
(camel) branch main updated (d80976cbf6e -> 3c775345ab5)
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 d80976cbf6e CAMEL-20297 camel-dhis2: do not swallow interrupted exceptions
new e7e6e1eddb0 CAMEL-20297 camel-azure-servicebus: do not swallow interrupted exceptions
new 6d56e383f99 CAMEL-20297 camel-cxf-spring-soap: do not swallow interrupted exceptions
new 1bff2a22f53 CAMEL-20297 camel-docker: do not swallow interrupted exceptions
new 8623fa384e4 CAMEL-20297 camel-grpc: do not swallow interrupted exceptions
new 558e5b3283f CAMEL-20297 camel-hazelcast: do not swallow interrupted exceptions
new 94933f335ff CAMEL-20297 camel-iec60870: do not swallow interrupted exceptions
new 3c775345ab5 CAMEL-20297 camel-wal: do not swallow interrupted exceptions
The 7 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:
.../apache/camel/component/azure/servicebus/ServiceBusConsumer.java | 2 +-
.../apache/camel/component/cxf/spring/jaxws/CxfSpringEndpoint.java | 4 +++-
.../apache/camel/component/docker/producer/AsyncDockerProducer.java | 6 ++++--
.../component/grpc/server/GrpcRequestAggregationStreamObserver.java | 1 +
.../component/grpc/server/GrpcRequestPropagationStreamObserver.java | 2 ++
.../camel/component/hazelcast/queue/HazelcastQueueConsumer.java | 2 +-
.../camel/component/hazelcast/seda/HazelcastSedaConsumer.java | 4 +++-
.../apache/camel/component/iec60870/client/ClientConnection.java | 2 +-
.../java/org/apache/camel/component/wal/DefaultLogSupervisor.java | 1 +
9 files changed, 17 insertions(+), 7 deletions(-)
(camel) 03/07: CAMEL-20297 camel-docker: 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 1bff2a22f5377f249dd043344db229c69daef6ea
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu Jan 11 10:09:30 2024 +0100
CAMEL-20297 camel-docker: do not swallow interrupted exceptions
---
.../apache/camel/component/docker/producer/AsyncDockerProducer.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/AsyncDockerProducer.java b/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/AsyncDockerProducer.java
index e0ed670c3ed..2f652cfa2af 100644
--- a/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/AsyncDockerProducer.java
+++ b/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/AsyncDockerProducer.java
@@ -116,8 +116,10 @@ public class AsyncDockerProducer extends DefaultAsyncProducer {
default:
throw new DockerException("Invalid operation: " + operation);
}
-
- } catch (DockerException | InterruptedException e) {
+ } catch (InterruptedException e) {
+ LOG.error("Interrupted while processing", e);
+ Thread.currentThread().interrupt();
+ } catch (DockerException e) {
LOG.error(e.getMessage(), e);
}
(camel) 07/07: CAMEL-20297 camel-wal: 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 3c775345ab512679b1c6a32fe6d4b2d0543cf9de
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu Jan 11 10:16:38 2024 +0100
CAMEL-20297 camel-wal: do not swallow interrupted exceptions
---
.../main/java/org/apache/camel/component/wal/DefaultLogSupervisor.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/components/camel-wal/src/main/java/org/apache/camel/component/wal/DefaultLogSupervisor.java b/components/camel-wal/src/main/java/org/apache/camel/component/wal/DefaultLogSupervisor.java
index 3ca901d627e..50e71407129 100644
--- a/components/camel-wal/src/main/java/org/apache/camel/component/wal/DefaultLogSupervisor.java
+++ b/components/camel-wal/src/main/java/org/apache/camel/component/wal/DefaultLogSupervisor.java
@@ -68,6 +68,7 @@ public class DefaultLogSupervisor implements LogSupervisor {
}
} catch (InterruptedException e) {
LOG.error("Failed to shutdown log flusher: {}", e.getMessage(), e);
+ Thread.currentThread().interrupt();
}
}
}
(camel) 06/07: CAMEL-20297 camel-iec60870: 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 94933f335fff454a1fc1cea304dd3fc2b5d47ea8
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu Jan 11 10:13:32 2024 +0100
CAMEL-20297 camel-iec60870: do not swallow interrupted exceptions
---
.../org/apache/camel/component/iec60870/client/ClientConnection.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientConnection.java b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientConnection.java
index 017edc7e2ac..d1673f98ecc 100644
--- a/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientConnection.java
+++ b/components/camel-iec60870/src/main/java/org/apache/camel/component/iec60870/client/ClientConnection.java
@@ -106,7 +106,7 @@ public class ClientConnection {
try {
latch.await(this.options.getConnectionTimeout(), TimeUnit.MILLISECONDS);
} catch (InterruptedException e) {
- // ignore
+ Thread.currentThread().interrupt();
}
}
(camel) 05/07: CAMEL-20297 camel-hazelcast: 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 558e5b3283f8a7ab7e181d7ec0889b9627f2b9b6
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu Jan 11 10:13:02 2024 +0100
CAMEL-20297 camel-hazelcast: do not swallow interrupted exceptions
---
.../camel/component/hazelcast/queue/HazelcastQueueConsumer.java | 2 +-
.../apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueConsumer.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueConsumer.java
index e177126b1ae..856767a6712 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueConsumer.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueConsumer.java
@@ -97,7 +97,7 @@ public class HazelcastQueueConsumer extends HazelcastDefaultConsumer {
}
}
} catch (InterruptedException e) {
- // ignore
+ Thread.currentThread().interrupt();
}
}
}
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java
index a4528c5445c..f8eed4ef240 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java
@@ -132,6 +132,7 @@ public class HazelcastSedaConsumer extends DefaultConsumer implements Runnable {
if (LOG.isDebugEnabled()) {
LOG.debug("Hzlq Consumer Interrupted: {}", e, e);
}
+ Thread.currentThread().interrupt();
continue;
} catch (Exception e) {
// Rollback
@@ -145,7 +146,8 @@ public class HazelcastSedaConsumer extends DefaultConsumer implements Runnable {
getExceptionHandler().handleException("Error processing exchange", exchange, e);
try {
Thread.sleep(endpoint.getConfiguration().getOnErrorDelay());
- } catch (InterruptedException ignore) {
+ } catch (InterruptedException ie) {
+ Thread.currentThread().interrupt();
}
}
}
(camel) 04/07: CAMEL-20297 camel-grpc: 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 8623fa384e4fa0c9b189dae3798c2aee4e269fc0
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu Jan 11 10:11:03 2024 +0100
CAMEL-20297 camel-grpc: do not swallow interrupted exceptions
---
.../component/grpc/server/GrpcRequestAggregationStreamObserver.java | 1 +
.../component/grpc/server/GrpcRequestPropagationStreamObserver.java | 2 ++
2 files changed, 3 insertions(+)
diff --git a/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/server/GrpcRequestAggregationStreamObserver.java b/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/server/GrpcRequestAggregationStreamObserver.java
index e7dcea253f4..d0aa4b2b197 100644
--- a/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/server/GrpcRequestAggregationStreamObserver.java
+++ b/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/server/GrpcRequestAggregationStreamObserver.java
@@ -71,6 +71,7 @@ public class GrpcRequestAggregationStreamObserver extends GrpcRequestAbstractStr
}
responseObserver.onCompleted();
} catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
responseObserver.onError(e);
}
}
diff --git a/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/server/GrpcRequestPropagationStreamObserver.java b/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/server/GrpcRequestPropagationStreamObserver.java
index 091b120eb22..4764cceac0b 100644
--- a/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/server/GrpcRequestPropagationStreamObserver.java
+++ b/components/camel-grpc/src/main/java/org/apache/camel/component/grpc/server/GrpcRequestPropagationStreamObserver.java
@@ -56,7 +56,9 @@ public class GrpcRequestPropagationStreamObserver extends GrpcRequestAbstractStr
responseObserver.onNext(responseBody);
}
} catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
responseObserver.onError(e);
+
}
}
(camel) 01/07: CAMEL-20297 camel-azure-servicebus: 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 e7e6e1eddb0b5670aee2c751acdb3610a21d6e71
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu Jan 11 10:03:05 2024 +0100
CAMEL-20297 camel-azure-servicebus: do not swallow interrupted exceptions
---
.../org/apache/camel/component/azure/servicebus/ServiceBusConsumer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConsumer.java b/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConsumer.java
index 9756ca91e7c..d00b30fe8f5 100644
--- a/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConsumer.java
+++ b/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConsumer.java
@@ -195,7 +195,7 @@ public class ServiceBusConsumer extends DefaultConsumer {
try {
Thread.sleep(getConfiguration().getReconnectDelay());
} catch (InterruptedException e) {
- // ignore
+ Thread.currentThread().interrupt();
}
}
(camel) 02/07: CAMEL-20297 camel-cxf-spring-soap: 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 6d56e383f9948eb3fa4a3bbd55cec0766ceee4f3
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu Jan 11 10:05:31 2024 +0100
CAMEL-20297 camel-cxf-spring-soap: do not swallow interrupted exceptions
---
.../apache/camel/component/cxf/spring/jaxws/CxfSpringEndpoint.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/main/java/org/apache/camel/component/cxf/spring/jaxws/CxfSpringEndpoint.java b/components/camel-cxf/camel-cxf-spring-soap/src/main/java/org/apache/camel/component/cxf/spring/jaxws/CxfSpringEndpoint.java
index b95dfe5be37..b87a16bcb94 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/main/java/org/apache/camel/component/cxf/spring/jaxws/CxfSpringEndpoint.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/main/java/org/apache/camel/component/cxf/spring/jaxws/CxfSpringEndpoint.java
@@ -343,7 +343,9 @@ public class CxfSpringEndpoint extends CxfEndpoint implements ApplicationContext
done = true;
}
}
-
+ } catch (InterruptedException e) {
+ LOG.info("Interrupted while enabling graceful SpringBus shutdown");
+ Thread.currentThread().interrupt();
} catch (Exception e) {
LOG.debug("Error when enabling SpringBus shutdown gracefully", e);
}