Author: davsclaus
Date: Wed Oct 19 06:43:34 2011
New Revision: 1185991
URL: http://svn.apache.org/viewvc?rev=1185991&view=rev
Log:
Fixed CS and polished logging message
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RedeliveryWithExceptionAndFaultDelayInHeader.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java?rev=1185991&r1=1185990&r2=1185991&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java Wed Oct
19 06:43:34 2011
@@ -16,12 +16,12 @@
*/
package org.apache.camel;
-import org.apache.camel.spi.Synchronization;
-import org.apache.camel.spi.UnitOfWork;
-
import java.util.List;
import java.util.Map;
+import org.apache.camel.spi.Synchronization;
+import org.apache.camel.spi.UnitOfWork;
+
/**
* An Exchange is the message container holding the information during the
entire routing of
* a {@link Message} received by a {@link Consumer}.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java?rev=1185991&r1=1185990&r2=1185991&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
Wed Oct 19 06:43:34 2011
@@ -16,18 +16,32 @@
*/
package org.apache.camel.processor;
-import org.apache.camel.*;
+import java.util.concurrent.Callable;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.camel.AsyncCallback;
+import org.apache.camel.AsyncProcessor;
+import org.apache.camel.CamelContext;
+import org.apache.camel.Exchange;
+import org.apache.camel.LoggingLevel;
+import org.apache.camel.Message;
+import org.apache.camel.Predicate;
+import org.apache.camel.Processor;
import org.apache.camel.model.OnExceptionDefinition;
import org.apache.camel.spi.ExecutorServiceManager;
import org.apache.camel.spi.SubUnitOfWorkCallback;
import org.apache.camel.spi.ThreadPoolProfile;
-import org.apache.camel.util.*;
+import org.apache.camel.util.AsyncProcessorConverterHelper;
+import org.apache.camel.util.AsyncProcessorHelper;
+import org.apache.camel.util.CamelContextHelper;
import org.apache.camel.util.CamelLogger;
-
-import java.util.concurrent.Callable;
-import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
+import org.apache.camel.util.EventHelper;
+import org.apache.camel.util.ExchangeHelper;
+import org.apache.camel.util.MessageHelper;
+import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.ServiceHelper;
/**
* Base redeliverable error handler that also supports a final dead letter
queue in case
@@ -356,15 +370,14 @@ public abstract class RedeliveryErrorHan
* @param redeliveryCounter The redeliveryCounter
* @return The time to wait before the next redelivery.
*/
- protected long determineRedeliveryDelay(Exchange exchange,
RedeliveryPolicy redeliveryPolicy, long redeliveryDelay, int redeliveryCounter){
+ protected long determineRedeliveryDelay(Exchange exchange,
RedeliveryPolicy redeliveryPolicy, long redeliveryDelay, int redeliveryCounter)
{
Message message = exchange.getIn();
Long delay = message.getHeader(Exchange.REDELIVERY_DELAY, Long.class);
if (delay == null) {
delay = redeliveryPolicy.calculateRedeliveryDelay(redeliveryDelay,
redeliveryCounter);
- }else{
- if (log.isDebugEnabled()) {
- log.debug("Redelivery delay is {} from
Message.getHeader(Exchange.REDELIVERY_DELAY)", new Object[]{delay});
- }
+ log.debug("Redelivery delay calculated as {}", delay);
+ } else {
+ log.debug("Redelivery delay is {} from Message Header [{}]",
delay, Exchange.REDELIVERY_DELAY);
}
return delay;
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RedeliveryWithExceptionAndFaultDelayInHeader.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RedeliveryWithExceptionAndFaultDelayInHeader.java?rev=1185991&r1=1185990&r2=1185991&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RedeliveryWithExceptionAndFaultDelayInHeader.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RedeliveryWithExceptionAndFaultDelayInHeader.java
Wed Oct 19 06:43:34 2011
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.processor;
import org.apache.camel.ContextTestSupport;
