Updated Branches: refs/heads/camel-2.11.x 22ada8abc -> 35e97008a refs/heads/camel-2.12.x 14a77ae9c -> 8165432ca
CAMEL-7005: Fixed regression in camel-stream when reading from system in. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8165432c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8165432c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8165432c Branch: refs/heads/camel-2.12.x Commit: 8165432ca68041f82a3487e65a1a4b91c32f4d72 Parents: 14a77ae Author: Claus Ibsen <davscl...@apache.org> Authored: Sun Nov 24 12:35:17 2013 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun Nov 24 12:35:33 2013 +0100 ---------------------------------------------------------------------- .../apache/camel/component/stream/StreamConsumer.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/8165432c/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java ---------------------------------------------------------------------- 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 ed33a0d..60b0603 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 @@ -162,7 +162,7 @@ public class StreamConsumer extends DefaultConsumer implements Runnable { eos = line == null; if (!eos && isRunAllowed()) { // read ahead if there is more data - line2 = br.readLine(); + line2 = readAhead(br); boolean last = line2 == null; index = processLine(line, last, index); } @@ -231,6 +231,15 @@ public class StreamConsumer extends DefaultConsumer implements Runnable { } } + private String readAhead(BufferedReader br) throws IOException { + if (uri.equals("in")) { + // do not read ahead with reading from system in + return null; + } else { + return br.readLine(); + } + } + private InputStream resolveStreamFromUrl() throws IOException { String u = endpoint.getUrl(); ObjectHelper.notEmpty(u, "url");
