You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2009/02/23 04:47:14 UTC
svn commit: r746871 - in /camel/trunk/camel-core/src:
main/java/org/apache/camel/model/ExceptionType.java
main/java/org/apache/camel/processor/RedeliveryPolicy.java
test/java/org/apache/camel/processor/DeadLetterChannelRedeliveryDelayPatternTest.java
Author: ningjiang
Date: Mon Feb 23 03:47:14 2009
New Revision: 746871
URL: http://svn.apache.org/viewvc?rev=746871&view=rev
Log:
Fixed the cs error of camel-core
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelRedeliveryDelayPatternTest.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java?rev=746871&r1=746870&r2=746871&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java Mon Feb 23 03:47:14 2009
@@ -22,11 +22,11 @@
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementRef;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlAttribute;
import org.apache.camel.CamelContext;
import org.apache.camel.Expression;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java?rev=746871&r1=746870&r2=746871&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java Mon Feb 23 03:47:14 2009
@@ -20,8 +20,8 @@
import org.apache.camel.Exchange;
import org.apache.camel.Predicate;
-import org.apache.camel.util.ObjectHelper;
import org.apache.camel.model.LoggingLevel;
+import org.apache.camel.util.ObjectHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -160,7 +160,7 @@
protected long calculateRedeliveryDelay(long previousDelay, int redeliveryCounter) {
if (ObjectHelper.isNotEmpty(delayPattern)) {
// calculate delay using the pattern
- return calculateRedeliverDelayUsingPattern(delayPattern, redeliveryCounter);
+ return calculateRedeliverDelayUsingPattern(delayPattern, redeliveryCounter);
}
// calculate the delay using the conventional parameters
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelRedeliveryDelayPatternTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelRedeliveryDelayPatternTest.java?rev=746871&r1=746870&r2=746871&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelRedeliveryDelayPatternTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelRedeliveryDelayPatternTest.java Mon Feb 23 03:47:14 2009
@@ -60,11 +60,11 @@
return new RouteBuilder() {
public void configure() throws Exception {
errorHandler(deadLetterChannel("mock:error").delayPattern("0:250;2:500").maximumRedeliveries(3)
- .onRedelivery(new Processor() {
- public void process(Exchange exchange) throws Exception {
- counter++;
- }
- }));
+ .onRedelivery(new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ counter++;
+ }
+ }));
from("direct:start").process(throwException(new Exception("Forced exception by unit test")));
}