svn commit: r703141 - in /activemq/camel/trunk/camel-core/src: main/java/org/apache/camel/builder/LoggingErrorHandlerBuilder.java main/java/org/apache/camel/processor/BatchProcessor.java test/java/org/apache/camel/processor/LoggingErrorHandlerTest.java

[davsclaus]

Author: davsclaus
Date: Thu Oct  9 04:43:59 2008
New Revision: 703141

URL: http://svn.apache.org/viewvc?rev=703141&view=rev
Log:
CAMEL-964. Applied patch with thanks. Fixed spelling.

Modified:
    
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/LoggingErrorHandlerBuilder.java
    
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java
    
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LoggingErrorHandlerTest.java

Modified: 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/LoggingErrorHandlerBuilder.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/LoggingErrorHandlerBuilder.java?rev=703141&r1=703140&r2=703141&view=diff
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/LoggingErrorHandlerBuilder.java
 (original)
+++ 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/LoggingErrorHandlerBuilder.java
 Thu Oct  9 04:43:59 2008
@@ -25,22 +25,22 @@
 import org.apache.commons.logging.LogFactory;
 
 /**
- * Uses the [EMAIL PROTECTED] Logger} as an error handler
+ * Uses the [EMAIL PROTECTED] Logger} as an error handler, will log at 
<tt>ERROR</tt> level by default.
  *
  * @version $Revision$
  */
 public class LoggingErrorHandlerBuilder extends ErrorHandlerBuilderSupport {
     private Log log = LogFactory.getLog(Logger.class);
-    private LoggingLevel level = LoggingLevel.INFO;
+    private LoggingLevel level = LoggingLevel.ERROR;
 
     public LoggingErrorHandlerBuilder() {
     }
 
-    public LoggingErrorHandlerBuilder(Log log) {
+    public LoggingErrorHandlerBuilder(final Log log) {
         this.log = log;
     }
 
-    public LoggingErrorHandlerBuilder(Log log, LoggingLevel level) {
+    public LoggingErrorHandlerBuilder(final Log log, final LoggingLevel level) 
{
         this.log = log;
         this.level = level;
     }
@@ -52,7 +52,7 @@
         return answer;
     }
 
-    public Processor createErrorHandler(RouteContext routeContext, Processor 
processor) {
+    public Processor createErrorHandler(final RouteContext routeContext, final 
Processor processor) {
         LoggingErrorHandler handler = new LoggingErrorHandler(processor, log, 
level);
         configure(handler);
         return handler;
@@ -62,7 +62,7 @@
         return level;
     }
 
-    public void setLevel(LoggingLevel level) {
+    public void setLevel(final LoggingLevel level) {
         this.level = level;
     }
 
@@ -70,7 +70,18 @@
         return log;
     }
 
-    public void setLog(Log log) {
+    public void setLog(final Log log) {
         this.log = log;
     }
+
+    public LoggingErrorHandlerBuilder level(final LoggingLevel level) {
+       this.level = level;
+       return this;
+    }
+
+    public LoggingErrorHandlerBuilder log(final Log log) {
+       this.log = log;
+       return this;
+    }
+
 }

Modified: 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java?rev=703141&r1=703140&r2=703141&view=diff
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java
 (original)
+++ 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java
 Thu Oct  9 04:43:59 2008
@@ -173,11 +173,11 @@
      * A strategy method to decide if the batch is completed the resulting 
exchanges should be sent
      */
     protected boolean isBatchCompleted(int index) {
-        // out batch size is optional and we should only check if its enabled 
(> 0)
+        // out batch size is optional and we should only check it if its 
enabled (= >0)
         if (outBatchSize > 0 && collection.size() >= outBatchSize) {
             return true;
         }
-        // fallback yo regular batch size check
+        // fallback to regular batch size check
         return index >= batchSize;
     }
 

Modified: 
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LoggingErrorHandlerTest.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LoggingErrorHandlerTest.java?rev=703141&r1=703140&r2=703141&view=diff
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LoggingErrorHandlerTest.java
 (original)
+++ 
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LoggingErrorHandlerTest.java
 Thu Oct  9 04:43:59 2008
@@ -103,9 +103,6 @@
         }
 
         public void info(Object message, Throwable t) {
-            assertNotNull(t);
-            assertNotNull(message);
-            logged = true;
         }
 
         public void warn(Object message) {
@@ -118,6 +115,9 @@
         }
 
         public void error(Object message, Throwable t) {
+            assertNotNull(t);
+            assertNotNull(message);
+            logged = true;
         }
 
         public void fatal(Object message) {