Author: davsclaus
Date: Tue Sep 1 15:00:35 2009
New Revision: 810083
URL: http://svn.apache.org/viewvc?rev=810083&view=rev
Log:
renamed a class and small polished to code
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultEventFactory.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedDelayer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Delayer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/EventFactory.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/EventHelper.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedDelayerTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultEventFactory.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultEventFactory.java?rev=810083&r1=810082&r2=810083&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultEventFactory.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultEventFactory.java
Tue Sep 1 15:00:35 2009
@@ -75,7 +75,7 @@
return new ExchangeFailedEvent(exchange);
}
- public EventObject createExchangeFailureHandled(Exchange exchange,
Processor failureHandler, boolean deadLetterChannel) {
+ public EventObject createExchangeFailureHandledEvent(Exchange exchange,
Processor failureHandler, boolean deadLetterChannel) {
return new ExchangeFailureHandledEvent(exchange, failureHandler,
deadLetterChannel);
}
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedDelayer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedDelayer.java?rev=810083&r1=810082&r2=810083&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedDelayer.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedDelayer.java
Tue Sep 1 15:00:35 2009
@@ -43,8 +43,8 @@
}
@ManagedAttribute(description = "Delay")
- public Expression getDelay() {
- return getDelayer().getDelay();
+ public Long getDelay() {
+ return getDelayer().getDelayValue();
}
@ManagedOperation(description = "Set a constant delay in millis")
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Delayer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Delayer.java?rev=810083&r1=810082&r2=810083&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Delayer.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Delayer.java
Tue Sep 1 15:00:35 2009
@@ -29,6 +29,7 @@
*/
public class Delayer extends DelayProcessorSupport implements Traceable {
private Expression delay;
+ private long delayValue;
public Delayer(Processor processor, Expression delay) {
super(processor);
@@ -48,6 +49,10 @@
return delay;
}
+ public long getDelayValue() {
+ return delayValue;
+ }
+
public void setDelay(Expression delay) {
this.delay = delay;
}
@@ -64,7 +69,10 @@
if (delay != null) {
Long longValue = delay.evaluate(exchange, Long.class);
if (longValue != null) {
+ delayValue = longValue;
time = longValue;
+ } else {
+ delayValue = 0;
}
}
if (time <= 0) {
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/EventFactory.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/EventFactory.java?rev=810083&r1=810082&r2=810083&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/spi/EventFactory.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/spi/EventFactory.java
Tue Sep 1 15:00:35 2009
@@ -50,6 +50,6 @@
EventObject createExchangeFailedEvent(Exchange exchange);
- EventObject createExchangeFailureHandled(Exchange exchange, Processor
failureHandler, boolean deadLetterChannel);
+ EventObject createExchangeFailureHandledEvent(Exchange exchange, Processor
failureHandler, boolean deadLetterChannel);
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/util/EventHelper.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/EventHelper.java?rev=810083&r1=810082&r2=810083&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/EventHelper.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/EventHelper.java
Tue Sep 1 15:00:35 2009
@@ -193,7 +193,7 @@
if (factory == null) {
return;
}
- EventObject event = factory.createExchangeFailureHandled(exchange,
failureHandler, deadLetterChannel);
+ EventObject event =
factory.createExchangeFailureHandledEvent(exchange, failureHandler,
deadLetterChannel);
if (event == null) {
return;
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedDelayerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedDelayerTest.java?rev=810083&r1=810082&r2=810083&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedDelayerTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedDelayerTest.java
Tue Sep 1 15:00:35 2009
@@ -21,7 +21,6 @@
import org.apache.camel.CamelContext;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.Expression;
import org.apache.camel.builder.RouteBuilder;
/**
@@ -69,7 +68,7 @@
// send in another message
template.sendBody("direct:start", "Bye World");
- Expression delay = (Expression) mbeanServer.getAttribute(delayerName,
"Delay");
+ Long delay = (Long) mbeanServer.getAttribute(delayerName, "Delay");
assertNotNull(delay);
completed = (Long) mbeanServer.getAttribute(routeName,
"ExchangesCompleted");
