You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/12/20 18:28:11 UTC
git commit: CAMEL-7087: Reset stream cache after processing in case
route is short. Thanks to Stephan Siano for the patch.
Updated Branches:
refs/heads/master cb79f67ba -> a2f600851
CAMEL-7087: Reset stream cache after processing in case route is short. Thanks to Stephan Siano for the patch.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a2f60085
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a2f60085
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a2f60085
Branch: refs/heads/master
Commit: a2f600851d2bffd63086287ad7f05c9474fb506a
Parents: cb79f67
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Dec 20 18:30:57 2013 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Dec 20 18:30:57 2013 +0100
----------------------------------------------------------------------
.../camel/processor/CamelInternalProcessor.java | 6 +-
.../camel/processor/StreamCachingInOutTest.java | 71 ++++++++++++++++++++
2 files changed, 76 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a2f60085/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
index 29d4c46..46b2b24 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
@@ -726,7 +726,11 @@ public class CamelInternalProcessor extends DelegateAsyncProcessor {
@Override
public void after(Exchange exchange, StreamCache sc) throws Exception {
- // noop
+ Object body = exchange.getIn().getBody();
+ if (body != null && body instanceof StreamCache) {
+ // reset so the cache is ready to be reused after processing
+ ((StreamCache) body).reset();
+ }
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a2f60085/camel-core/src/test/java/org/apache/camel/processor/StreamCachingInOutTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/StreamCachingInOutTest.java b/camel-core/src/test/java/org/apache/camel/processor/StreamCachingInOutTest.java
new file mode 100644
index 0000000..2514961
--- /dev/null
+++ b/camel-core/src/test/java/org/apache/camel/processor/StreamCachingInOutTest.java
@@ -0,0 +1,71 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.processor;
+
+import java.io.InputStream;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+
+public class StreamCachingInOutTest extends ContextTestSupport {
+ private static final String TEST_FILE = "org/apache/camel/processor/simple.txt";
+
+ public void testStreamCachingPerRoute() throws Exception {
+ MockEndpoint c = getMockEndpoint("mock:c");
+ c.expectedMessageCount(1);
+
+ InputStream message = getTestFileStream();
+ template.sendBody("direct:c", message);
+
+ assertMockEndpointsSatisfied();
+ assertEquals(c.assertExchangeReceived(0).getIn().getBody(String.class), "James,Guillaume,Hiram,Rob,Roman");
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:c").noStreamCaching().to("direct:d").to("mock:c");
+ from("direct:d").streamCaching().process(new TestProcessor());
+ }
+ };
+ }
+
+ // have a test processor that reads the stream and makes sure it is reset
+ private class TestProcessor implements Processor {
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ InputStream is = exchange.getIn().getMandatoryBody(InputStream.class);
+ while (is.available() > 0) {
+ is.read();
+ }
+ is.close();
+ }
+ }
+
+ // there is some special handling for ByteArrayInputStream so we read
+ // InputStreams from a file
+ private InputStream getTestFileStream() {
+ InputStream answer = getClass().getClassLoader().getResourceAsStream(TEST_FILE);
+ assertNotNull("Should have found the file: " + TEST_FILE + " on the classpath", answer);
+ return answer;
+ }
+}
\ No newline at end of file