This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 339617d Regen
339617d is described below
commit 339617d4458dd68ca1916b29cbed501c121694d6
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon Sep 21 06:49:40 2020 +0200
Regen
---
.../processor/MulticastParallelTimeoutStreamCachingTest.java | 8 ++++----
.../org/apache/camel/converter/stream/FileInputStreamCache.java | 7 ++++---
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelTimeoutStreamCachingTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelTimeoutStreamCachingTest.java
index 6e39f10..0271f63 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelTimeoutStreamCachingTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelTimeoutStreamCachingTest.java
@@ -75,7 +75,7 @@ public class MulticastParallelTimeoutStreamCachingTest
extends ContextTestSuppor
File[] files = f.listFiles();
assertEquals(0, files.length);
}
-
+
@Test
public void
testCreateOutputStreamCacheBeforeTimeoutButWriteToOutputStreamCacheAfterTimeout()
throws Exception {
getMockEndpoint("mock:exception").expectedMessageCount(1);
@@ -102,7 +102,7 @@ public class MulticastParallelTimeoutStreamCachingTest
extends ContextTestSuppor
});
}
};
-
+
final Processor processor2 = new Processor() {
public void process(Exchange exchange) throws IOException {
// create first the OutputStreamCache and then sleep
@@ -129,13 +129,13 @@ public class MulticastParallelTimeoutStreamCachingTest
extends ContextTestSuppor
context.getStreamCachingStrategy().setRemoveSpoolDirectoryWhenStopping(false);
context.getStreamCachingStrategy().setSpoolThreshold(1L);
context.setStreamCaching(true);
-
+
onException(IOException.class).to("mock:exception");
from("direct:a").multicast().timeout(500L).parallelProcessing().to("direct:x");
from("direct:x").process(processor1).to("mock:x");
-
+
from("direct:b").multicast().timeout(500l).parallelProcessing().to("direct:y");
from("direct:y").process(processor2).to("mock:y");
diff --git
a/core/camel-support/src/main/java/org/apache/camel/converter/stream/FileInputStreamCache.java
b/core/camel-support/src/main/java/org/apache/camel/converter/stream/FileInputStreamCache.java
index 3dcae3f..b72148e 100644
---
a/core/camel-support/src/main/java/org/apache/camel/converter/stream/FileInputStreamCache.java
+++
b/core/camel-support/src/main/java/org/apache/camel/converter/stream/FileInputStreamCache.java
@@ -256,9 +256,10 @@ public final class FileInputStreamCache extends
InputStream implements StreamCac
// This can happen when in the splitter or Multi-cast case
with parallel processing, the CachedOutputStream is created when the main unit
of work
// is still active, but has a timeout and after the timeout
which stops the unit of work the FileOutputStream is created.
// We only can throw here an Exception and inform the user
that the processing took longer than the set timeout.
- String error = "Cannot create a FileOutputStream for Stream
Caching, because this FileOutputStream would never be removed from the file
system."
- + " This situation can happen with a Splitter or Multi
Cast in parallel processing if there is a timeout set on the Splitter or Multi
Cast, "
- + " and the processing in a sub-branch takes longer
than the timeout. Consider to increase the timeout.";
+ String error
+ = "Cannot create a FileOutputStream for Stream
Caching, because this FileOutputStream would never be removed from the file
system."
+ + " This situation can happen with a Splitter or
Multi Cast in parallel processing if there is a timeout set on the Splitter or
Multi Cast, "
+ + " and the processing in a sub-branch takes longer
than the timeout. Consider to increase the timeout.";
LOG.error(error);
throw new IOException(error);
}
