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/15 13:21:00 UTC
(camel) branch main updated (8d68258d5ff -> 221f78a761a)
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 8d68258d5ff CAMEL-20218: Use a single Kafka consumer with assign() call to consume all cached entries from the beginning of the Kafka topic. (#12777)
new 938422492fc CAMEL-20297 camel-jpa: do not swallow interrupted exceptions
new e1ba669db5f CAMEL-20297 camel-jt400: do not swallow interrupted exceptions
new fb007b3f060 CAMEL-20297 camel-kubernetes: do not swallow interrupted exceptions
new dc4036d58ef CAMEL-20297 camel-mongodb: do not swallow interrupted exceptions
new 10312a7335e CAMEL-20297 camel-netty: do not swallow interrupted exceptions
new 7b4e8d993dc CAMEL-20297 camel-olingo2: do not swallow interrupted exceptions
new 8b11504c449 CAMEL-20297 camel-olingo4: do not swallow interrupted exceptions
new b91aede0318 CAMEL-20297 camel-optaplanner: do not swallow interrupted exceptions
new 642ddcfac3a CAMEL-20297 camel-platform-http-vertx: do not swallow interrupted exceptions
new 221f78a761a CAMEL-20297 camel-xmpp: do not swallow interrupted exceptions
The 10 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/jpa/JpaPollingConsumer.java | 5 ++++-
.../java/org/apache/camel/component/jt400/Jt400PgmProducer.java | 3 +++
.../kubernetes/cluster/lock/KubernetesLeadershipController.java | 2 ++
.../component/kubernetes/cluster/lock/TimedLeaderNotifier.java | 3 ++-
.../camel/component/mongodb/MongoAbstractConsumerThread.java | 4 +++-
.../java/org/apache/camel/component/netty/NettyProducer.java | 3 +++
.../org/apache/camel/component/olingo2/Olingo2AppWrapper.java | 1 +
.../java/org/apache/camel/component/olingo2/Olingo2Consumer.java | 4 +++-
.../org/apache/camel/component/olingo4/Olingo4AppWrapper.java | 1 +
.../java/org/apache/camel/component/olingo4/Olingo4Consumer.java | 4 +++-
.../apache/camel/component/optaplanner/OptaPlannerProducer.java | 6 ++++++
.../component/platform/http/vertx/VertxPlatformHttpServer.java | 3 +++
.../java/org/apache/camel/component/xmpp/XmppDirectProducer.java | 7 ++++---
.../org/apache/camel/component/xmpp/XmppGroupChatProducer.java | 9 +++++++++
.../org/apache/camel/component/xmpp/XmppPrivateChatProducer.java | 9 +++++++++
15 files changed, 56 insertions(+), 8 deletions(-)
(camel) 03/10: CAMEL-20297 camel-kubernetes: 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 fb007b3f060d3a379241119046c859f61e0399ec
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Jan 15 11:05:15 2024 +0100
CAMEL-20297 camel-kubernetes: do not swallow interrupted exceptions
---
.../kubernetes/cluster/lock/KubernetesLeadershipController.java | 2 ++
.../camel/component/kubernetes/cluster/lock/TimedLeaderNotifier.java | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/KubernetesLeadershipController.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/KubernetesLeadershipController.java
index d8a54756f34..5eea0823cef 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/KubernetesLeadershipController.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/KubernetesLeadershipController.java
@@ -217,6 +217,7 @@ public class KubernetesLeadershipController implements Service {
Thread.sleep(delay);
} catch (InterruptedException e) {
LOG.warn("Thread interrupted", e);
+ Thread.currentThread().interrupt();
}
LOG.info("{} Current pod is becoming the new leader now...", logPrefix);
@@ -238,6 +239,7 @@ public class KubernetesLeadershipController implements Service {
Thread.sleep(delay);
} catch (InterruptedException e) {
LOG.warn("Thread interrupted", e);
+ Thread.currentThread().interrupt();
}
LOG.info("{} Current pod is losing leadership now...", logPrefix);
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/TimedLeaderNotifier.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/TimedLeaderNotifier.java
index 8643f5a1e40..f2df12a81e6 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/TimedLeaderNotifier.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/TimedLeaderNotifier.java
@@ -109,7 +109,8 @@ public class TimedLeaderNotifier implements Service {
try {
executor.awaitTermination(1, TimeUnit.SECONDS);
} catch (InterruptedException e) {
- // ignore
+ LOG.info("Interrupted while waiting for thread termination");
+ Thread.currentThread().interrupt();
}
}
}
(camel) 10/10: CAMEL-20297 camel-xmpp: 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 221f78a761a9e9090fe5ad132ad448d52cc1c74e
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Jan 15 11:12:38 2024 +0100
CAMEL-20297 camel-xmpp: do not swallow interrupted exceptions
---
.../java/org/apache/camel/component/xmpp/XmppDirectProducer.java | 7 ++++---
.../org/apache/camel/component/xmpp/XmppGroupChatProducer.java | 9 +++++++++
.../org/apache/camel/component/xmpp/XmppPrivateChatProducer.java | 9 +++++++++
3 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppDirectProducer.java b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppDirectProducer.java
index 3b9f0bc6bc5..20fad1159d3 100644
--- a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppDirectProducer.java
+++ b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppDirectProducer.java
@@ -75,11 +75,12 @@ public class XmppDirectProducer extends DefaultProducer {
} else {
throw new Exception("Body does not contain Stanza/Stanza[] object(s)");
}
- } catch (XMPPException xmppe) {
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
throw new RuntimeExchangeException(
- "Cannot send XMPP direct: from " + endpoint.getUser() + " to: "
+ "Interrupted while sending XMPP direct: from " + endpoint.getUser() + " to: "
+ XmppEndpoint.getConnectionMessage(connection),
- exchange, xmppe);
+ exchange, e);
} catch (Exception e) {
throw new RuntimeExchangeException(
diff --git a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppGroupChatProducer.java b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppGroupChatProducer.java
index 4b22dc03c06..c6ad065fe2c 100644
--- a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppGroupChatProducer.java
+++ b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppGroupChatProducer.java
@@ -52,6 +52,9 @@ public class XmppGroupChatProducer extends DefaultProducer {
if (connection == null) {
try {
connection = endpoint.createConnection();
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ throw new RuntimeExchangeException("Interrupted while connecting to XMPP server.", exchange, e);
} catch (Exception e) {
throw new RuntimeExchangeException("Could not connect to XMPP server.", exchange, e);
}
@@ -60,6 +63,9 @@ public class XmppGroupChatProducer extends DefaultProducer {
if (chat == null) {
try {
initializeChat();
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ throw new RuntimeExchangeException("Interrupted while initializing XMPP chat.", exchange, e);
} catch (Exception e) {
throw new RuntimeExchangeException("Could not initialize XMPP chat.", exchange, e);
}
@@ -84,6 +90,9 @@ public class XmppGroupChatProducer extends DefaultProducer {
// must invoke nextMessage to consume the response from the server
// otherwise the client local queue will fill up (CAMEL-1467)
chat.pollMessage();
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ throw new RuntimeExchangeException("Interrupted while sending XMPP message: " + message, exchange, e);
} catch (Exception e) {
throw new RuntimeExchangeException("Could not send XMPP message: " + message, exchange, e);
}
diff --git a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java
index 8da40f6dddf..bcd36d4f6d2 100644
--- a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java
+++ b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java
@@ -61,6 +61,9 @@ public class XmppPrivateChatProducer extends DefaultProducer {
if (!connection.isConnected()) {
this.reconnect();
}
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ throw new RuntimeCamelException("Interrupted while connecting to XMPP server.", e);
} catch (Exception e) {
throw new RuntimeCamelException("Could not connect to XMPP server.", e);
}
@@ -88,6 +91,12 @@ public class XmppPrivateChatProducer extends DefaultProducer {
LOG.debug("Sending XMPP message to {} from {} : {}", participant, endpoint.getUser(), message.getBody());
}
chat.send(message);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ throw new RuntimeExchangeException(
+ "Interrupted while sending XMPP message to " + participant + " from " + endpoint.getUser() + " : " + message
+ + " to: " + XmppEndpoint.getConnectionMessage(connection),
+ exchange, e);
} catch (Exception e) {
throw new RuntimeExchangeException(
"Could not send XMPP message to " + participant + " from " + endpoint.getUser() + " : " + message
(camel) 01/10: CAMEL-20297 camel-jpa: 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 938422492fca115dfd60274aa3fdcfb910843827
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Jan 15 11:04:55 2024 +0100
CAMEL-20297 camel-jpa: do not swallow interrupted exceptions
---
.../main/java/org/apache/camel/component/jpa/JpaPollingConsumer.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaPollingConsumer.java b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaPollingConsumer.java
index 8489e16157e..0564411a47c 100644
--- a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaPollingConsumer.java
+++ b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaPollingConsumer.java
@@ -199,7 +199,10 @@ public class JpaPollingConsumer extends PollingConsumerSupport {
Future<Exchange> future = executorService.submit((Callable<Exchange>) this::receive);
try {
return future.get(timeout, TimeUnit.MILLISECONDS);
- } catch (ExecutionException | InterruptedException e) {
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ throw RuntimeCamelException.wrapRuntimeCamelException(e);
+ } catch (ExecutionException e) {
throw RuntimeCamelException.wrapRuntimeCamelException(e);
} catch (TimeoutException e) {
// ignore as we hit timeout then return null
(camel) 07/10: CAMEL-20297 camel-olingo4: 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 8b11504c44912d5cc43c4043271421b520734129
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Jan 15 11:05:48 2024 +0100
CAMEL-20297 camel-olingo4: do not swallow interrupted exceptions
---
.../java/org/apache/camel/component/olingo4/Olingo4AppWrapper.java | 1 +
.../main/java/org/apache/camel/component/olingo4/Olingo4Consumer.java | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4AppWrapper.java b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4AppWrapper.java
index fd70ef9d270..f65f025357a 100644
--- a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4AppWrapper.java
+++ b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4AppWrapper.java
@@ -96,6 +96,7 @@ public class Olingo4AppWrapper {
}
} catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
throw new RuntimeCamelException(e.getMessage(), e);
}
diff --git a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Consumer.java b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Consumer.java
index 1f44e43dab1..957a155a882 100644
--- a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Consumer.java
+++ b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Consumer.java
@@ -106,7 +106,9 @@ public class Olingo4Consumer extends AbstractApiConsumer<Olingo4ApiName, Olingo4
} else {
return ApiConsumerHelper.getResultsProcessed(this, result[0], isSplitResult());
}
-
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ throw RuntimeCamelException.wrapRuntimeCamelException(e);
} catch (Exception e) {
throw RuntimeCamelException.wrapRuntimeCamelException(e);
}
(camel) 06/10: CAMEL-20297 camel-olingo2: 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 7b4e8d993dcb5405919d678c20e9abd710ea7be1
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Jan 15 11:05:40 2024 +0100
CAMEL-20297 camel-olingo2: do not swallow interrupted exceptions
---
.../java/org/apache/camel/component/olingo2/Olingo2AppWrapper.java | 1 +
.../main/java/org/apache/camel/component/olingo2/Olingo2Consumer.java | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2AppWrapper.java b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2AppWrapper.java
index 04b233523c1..53f9a0e35fe 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2AppWrapper.java
+++ b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2AppWrapper.java
@@ -95,6 +95,7 @@ public class Olingo2AppWrapper {
}
} catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
throw new RuntimeCamelException(e.getMessage(), e);
}
diff --git a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Consumer.java b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Consumer.java
index b81fc5df9da..a6e2f191da7 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Consumer.java
+++ b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Consumer.java
@@ -101,7 +101,9 @@ public class Olingo2Consumer extends AbstractApiConsumer<Olingo2ApiName, Olingo2
} else {
return ApiConsumerHelper.getResultsProcessed(this, result[0], isSplitResult());
}
-
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ throw RuntimeCamelException.wrapRuntimeCamelException(e);
} catch (Exception t) {
throw RuntimeCamelException.wrapRuntimeCamelException(t);
}
(camel) 04/10: CAMEL-20297 camel-mongodb: 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 dc4036d58ef6b5b41c0cb51076c90aba75d64c04
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Jan 15 11:05:26 2024 +0100
CAMEL-20297 camel-mongodb: do not swallow interrupted exceptions
---
.../apache/camel/component/mongodb/MongoAbstractConsumerThread.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoAbstractConsumerThread.java b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoAbstractConsumerThread.java
index 5af931a3808..ea2cca9dc0e 100644
--- a/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoAbstractConsumerThread.java
+++ b/components/camel-mongodb/src/main/java/org/apache/camel/component/mongodb/MongoAbstractConsumerThread.java
@@ -85,7 +85,9 @@ abstract class MongoAbstractConsumerThread implements Runnable {
if (cursorRegenerationDelayEnabled) {
try {
Thread.sleep(cursorRegenerationDelay);
- } catch (InterruptedException ignored) {
+ } catch (InterruptedException e) {
+ log.info("Interrupted while waiting for the cursor regeneration");
+ Thread.currentThread().interrupt();
}
}
(camel) 05/10: CAMEL-20297 camel-netty: 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 10312a7335e73a06459c478bb855174700c29b7b
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Jan 15 11:05:33 2024 +0100
CAMEL-20297 camel-netty: do not swallow interrupted exceptions
---
.../src/main/java/org/apache/camel/component/netty/NettyProducer.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyProducer.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyProducer.java
index 4433173e26a..725c310dbb2 100644
--- a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyProducer.java
+++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyProducer.java
@@ -374,6 +374,9 @@ public class NettyProducer extends DefaultAsyncProducer {
// but we can try to get a result with a 0 timeout, then netty will throw the caused
// exception wrapped in an outer exception
channelFuture.get(0, TimeUnit.MILLISECONDS);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ cause = e.getCause();
} catch (Exception e) {
cause = e.getCause();
}
(camel) 08/10: CAMEL-20297 camel-optaplanner: 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 b91aede031841dbf3cba5d0da71dfac9ebb7a854
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Jan 15 11:05:55 2024 +0100
CAMEL-20297 camel-optaplanner: do not swallow interrupted exceptions
---
.../org/apache/camel/component/optaplanner/OptaPlannerProducer.java | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/components/camel-optaplanner/src/main/java/org/apache/camel/component/optaplanner/OptaPlannerProducer.java b/components/camel-optaplanner/src/main/java/org/apache/camel/component/optaplanner/OptaPlannerProducer.java
index da858737867..580a622272e 100644
--- a/components/camel-optaplanner/src/main/java/org/apache/camel/component/optaplanner/OptaPlannerProducer.java
+++ b/components/camel-optaplanner/src/main/java/org/apache/camel/component/optaplanner/OptaPlannerProducer.java
@@ -86,6 +86,9 @@ public class OptaPlannerProducer extends DefaultAsyncProducer {
// wait for result
populateResult(exchange, solverJob);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ exchange.setException(e);
} catch (Exception e) {
exchange.setException(e);
} finally {
@@ -103,6 +106,9 @@ public class OptaPlannerProducer extends DefaultAsyncProducer {
// synchronous or wrong type of body
callback.done(true);
return true;
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ exchange.setException(e);
} catch (Exception e) {
exchange.setException(e);
}
(camel) 09/10: CAMEL-20297 camel-platform-http-vertx: 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 642ddcfac3ac07052d5612d5274af3523507a422
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Jan 15 11:06:14 2024 +0100
CAMEL-20297 camel-platform-http-vertx: do not swallow interrupted exceptions
---
.../camel/component/platform/http/vertx/VertxPlatformHttpServer.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpServer.java b/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpServer.java
index 132c3c6139a..8eed4dd9467 100644
--- a/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpServer.java
+++ b/components/camel-platform-http-vertx/src/main/java/org/apache/camel/component/platform/http/vertx/VertxPlatformHttpServer.java
@@ -232,6 +232,7 @@ public class VertxPlatformHttpServer extends ServiceSupport implements CamelCont
try {
latch.await();
} catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
throw new RuntimeException(e);
}
},
@@ -269,6 +270,7 @@ public class VertxPlatformHttpServer extends ServiceSupport implements CamelCont
try {
latch.await();
} catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
throw new RuntimeException(e);
}
},
@@ -306,6 +308,7 @@ public class VertxPlatformHttpServer extends ServiceSupport implements CamelCont
try {
latch.await();
} catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
throw new RuntimeException(e);
}
},
(camel) 02/10: CAMEL-20297 camel-jt400: 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 e1ba669db5fd37e42a06325ac0664b58f60806fd
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Jan 15 11:05:05 2024 +0100
CAMEL-20297 camel-jt400: do not swallow interrupted exceptions
---
.../main/java/org/apache/camel/component/jt400/Jt400PgmProducer.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400PgmProducer.java b/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400PgmProducer.java
index 5d3e4c2e49a..bd9a02f888a 100644
--- a/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400PgmProducer.java
+++ b/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400PgmProducer.java
@@ -89,6 +89,9 @@ public class Jt400PgmProducer extends DefaultProducer {
} else {
throw new Jt400PgmCallException(getOutputMessages(pgmCall));
}
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ throw new Jt400PgmCallException(e);
} catch (Exception e) {
throw new Jt400PgmCallException(e);
} finally {