svn commit: r991815 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/component/file/GenericFile.java test/java/org/apache/camel/component/file/FileConsumerIntercepEmptyFileTest.java

[ningjiang]

Author: ningjiang
Date: Thu Sep  2 05:19:06 2010
New Revision: 991815

URL: http://svn.apache.org/viewvc?rev=991815&view=rev
Log:
CAMEL-3100 Polishing the codes

Modified:
    
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java
    
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIntercepEmptyFileTest.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java?rev=991815&r1=991814&r2=991815&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java
 Thu Sep  2 05:19:06 2010
@@ -123,7 +123,6 @@ public class GenericFile<T>  {
             message.setHeader(Exchange.FILE_PARENT, getParent());
     
             if (getFileLength() >= 0) {
-                System.out.println("The file length is " + getFileLength());
                 message.setHeader("CamelFileLength", getFileLength());
             }
             if (getLastModified() > 0) {

Modified: 
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIntercepEmptyFileTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIntercepEmptyFileTest.java?rev=991815&r1=991814&r2=991815&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIntercepEmptyFileTest.java
 (original)
+++ 
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIntercepEmptyFileTest.java
 Thu Sep  2 05:19:06 2010
@@ -26,12 +26,12 @@ import org.apache.camel.component.mock.M
  */
 public class FileConsumerIntercepEmptyFileTest extends ContextTestSupport {
 
-    public void testExludePreAndPostfixes() throws Exception {
+    public void testExludeZeroLengthFiles() throws Exception {
         deleteDirectory("./target/exclude");
         
         MockEndpoint mock1 = getMockEndpoint("mock:result");
-        mock1.expectedMessageCount(4);
-        
+        mock1.expectedMessageCount(2);
+        mock1.expectedBodiesReceived("Hello World", "Bye World");
         MockEndpoint mock2 = getMockEndpoint("mock:skip");
         mock2.expectedMessageCount(2);
         
@@ -53,7 +53,7 @@ public class FileConsumerIntercepEmptyFi
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                interceptFrom().when(simple("${file:length} == 
0")).to("mock:skip");
+                interceptFrom().when(simple("${file:length} == 
0")).to("mock:skip").stop();
                 from("file://target/exclude/")
                     
.convertBodyTo(String.class).to("log:test").to("mock:result");
             }