Author: hadrian
Date: Sun Jul 11 19:33:25 2010
New Revision: 963138
URL: http://svn.apache.org/viewvc?rev=963138&view=rev
Log:
CAMEL-2937. Only print prompt message if input is System.in
Modified:
camel/trunk/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java
camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java
Modified:
camel/trunk/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java?rev=963138&r1=963137&r2=963138&view=diff
==============================================================================
---
camel/trunk/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java
(original)
+++
camel/trunk/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java
Sun Jul 11 19:33:25 2010
@@ -37,12 +37,7 @@ public class PrinterPrintTest extends Ca
// Check if there is an awt library
private boolean isAwtHeadless() {
- if (Boolean.getBoolean("java.awt.headless")) {
- System.out.println("Running headless. Skipping test as Images may
not work.");
- return true;
- } else {
- return false;
- }
+ return Boolean.getBoolean("java.awt.headless");
}
private void sendFile() throws Exception {
Modified:
camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java?rev=963138&r1=963137&r2=963138&view=diff
==============================================================================
---
camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java
(original)
+++
camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamConsumer.java
Sun Jul 11 19:33:25 2010
@@ -181,7 +181,9 @@ public class StreamConsumer extends Defa
Thread.currentThread().interrupt();
}
}
- LOG.trace(endpoint.getPromptMessage());
+ if (inputStream == System.in) {
+ System.out.print(endpoint.getPromptMessage());
+ }
}
private InputStream resolveStreamFromUrl() throws IOException {
