Author: ningjiang
Date: Wed Oct 15 20:32:03 2008
New Revision: 705129
URL: http://svn.apache.org/viewvc?rev=705129&view=rev
Log:
Fixed the cs errors of camel-core
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/component/bean/BeanInfo.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Logger.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/BelasThreadErrorHandlerIssue901Test.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=705129&r1=705128&r2=705129&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
Wed Oct 15 20:32:03 2008
@@ -75,13 +75,13 @@
}
public LoggingErrorHandlerBuilder level(final LoggingLevel level) {
- this.level = level;
- return this;
+ this.level = level;
+ return this;
}
public LoggingErrorHandlerBuilder log(final Log log) {
- this.log = log;
- return this;
+ this.log = log;
+ return this;
}
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java?rev=705129&r1=705128&r2=705129&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
Wed Oct 15 20:32:03 2008
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.bean;
+
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
@@ -41,11 +42,13 @@
import org.apache.camel.builder.ExpressionBuilder;
import org.apache.camel.language.LanguageAnnotation;
import org.apache.camel.spi.Registry;
-import static org.apache.camel.util.ExchangeHelper.convertToType;
import org.apache.camel.util.ObjectHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import static org.apache.camel.util.ExchangeHelper.convertToType;
+
+
/**
* Represents the metadata about a bean type created via a combination of
* introspection and annotations together with some useful sensible defaults
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java?rev=705129&r1=705128&r2=705129&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java
Wed Oct 15 20:32:03 2008
@@ -32,13 +32,15 @@
import org.apache.camel.Processor;
import org.apache.camel.Route;
import org.apache.camel.builder.ErrorHandlerBuilder;
-import static org.apache.camel.builder.PredicateBuilder.toPredicate;
import org.apache.camel.language.constant.ConstantLanguage;
import org.apache.camel.processor.CatchProcessor;
import org.apache.camel.processor.RedeliveryPolicy;
import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.ObjectHelper;
+import static org.apache.camel.builder.PredicateBuilder.toPredicate;
+
+
/**
* Represents an XML <onException/> element
*
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java?rev=705129&r1=705128&r2=705129&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java
Wed Oct 15 20:32:03 2008
@@ -57,11 +57,12 @@
int redeliveryCounter;
long redeliveryDelay;
boolean sync = true;
+ Predicate handledPredicate;
- // default behaviour which can be overloaded on a per exception basis
+ // default behavior which can be overloaded on a per exception basis
RedeliveryPolicy currentRedeliveryPolicy = redeliveryPolicy;
Processor failureProcessor = deadLetter;
- Predicate handledPredicate = null;
+
}
public DeadLetterChannel(Processor output, Processor deadLetter) {
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Logger.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Logger.java?rev=705129&r1=705128&r2=705129&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Logger.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Logger.java
Wed Oct 15 20:32:03 2008
@@ -208,7 +208,8 @@
log.warn(message, exception);
}
break;
- case OFF: break;
+ case OFF:
+ break;
default:
log.error("Unknown level: " + level + " when trying to log
exchange: " + message, exception);
}
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/BelasThreadErrorHandlerIssue901Test.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/BelasThreadErrorHandlerIssue901Test.java?rev=705129&r1=705128&r2=705129&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/BelasThreadErrorHandlerIssue901Test.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/BelasThreadErrorHandlerIssue901Test.java
Wed Oct 15 20:32:03 2008
@@ -19,8 +19,8 @@
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -29,10 +29,13 @@
*/
public class BelasThreadErrorHandlerIssue901Test extends ContextTestSupport {
private static final transient Log LOG =
LogFactory.getLog(BelasThreadErrorHandlerIssue901Test.class);
- private String msg1 = "Message Intended For Processor #1",
- msg2 = "Message Intended For Processor #2",
- msg3 = "Message Intended For Processor #3";
- private int callCounter1 = 0, callCounter2 = 0, callCounter3 = 0;
+ private String msg1 = "Message Intended For Processor #1";
+ private String msg2 = "Message Intended For Processor #2";
+ private String msg3 = "Message Intended For Processor #3";
+
+ private int callCounter1;
+ private int callCounter2;
+ private int callCounter3;
private int redelivery = 1;
protected void setUp() throws Exception {
