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/22 09:41:34 UTC

(camel) 02/03: CAMEL-20297 camel-stream: 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 5a035215d0ea245abc1a7b7a4d7d32f5c991d1f4
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Fri Jan 19 11:02:08 2024 +0100

    CAMEL-20297 camel-stream: do not swallow interrupted exceptions
---
 .../java/org/apache/camel/component/stream/FileWatcherStrategy.java     | 1 +
 .../src/main/java/org/apache/camel/component/stream/StreamConsumer.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/camel-stream/src/main/java/org/apache/camel/component/stream/FileWatcherStrategy.java b/components/camel-stream/src/main/java/org/apache/camel/component/stream/FileWatcherStrategy.java
index 02f8b2b623d..25582e57d95 100644
--- a/components/camel-stream/src/main/java/org/apache/camel/component/stream/FileWatcherStrategy.java
+++ b/components/camel-stream/src/main/java/org/apache/camel/component/stream/FileWatcherStrategy.java
@@ -194,6 +194,7 @@ public class FileWatcherStrategy extends ServiceSupport implements CamelContextA
                     // wait for a key to be available
                     key = watcher.poll(pollTimeout, TimeUnit.MILLISECONDS);
                 } catch (InterruptedException ex) {
+                    Thread.currentThread().interrupt();
                     break;
                 }
 
diff --git a/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java b/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java
index 0c766e1b400..3ab6db20563 100644
--- a/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java
+++ b/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java
@@ -134,7 +134,7 @@ public class StreamConsumer extends DefaultConsumer implements Runnable {
                 readFromStreamRawMode();
             }
         } catch (InterruptedException e) {
-            // we are closing down so ignore
+            Thread.currentThread().interrupt();
         } catch (Exception e) {
             getExceptionHandler().handleException(e);
         }