Author: davsclaus
Date: Mon Aug 25 21:16:09 2008
New Revision: 688957
URL: http://svn.apache.org/viewvc?rev=688957&view=rev
Log:
CAMEL-845: added firedtime property.
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerConsumer.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/timer/TimerFiredTimeTest.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerConsumer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerConsumer.java?rev=688957&r1=688956&r2=688957&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerConsumer.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerConsumer.java
Mon Aug 25 21:16:09 2008
@@ -88,7 +88,12 @@
exchange.setProperty("org.apache.camel.timer.name",
endpoint.getTimerName());
exchange.setProperty("org.apache.camel.timer.time",
endpoint.getTime());
exchange.setProperty("org.apache.camel.timer.period",
endpoint.getPeriod());
- exchange.setProperty("org.apache.camel.timer.firedtime", new Date());
+
+ Date now = new Date();
+ exchange.setProperty("org.apache.camel.timer.firedTime", now);
+ // also set now on in header with same key as quaartz to be consistent
+ exchange.getIn().setHeader("firedTime", now);
+
try {
getProcessor().process(exchange);
} catch (Exception e) {
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/timer/TimerFiredTimeTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/timer/TimerFiredTimeTest.java?rev=688957&r1=688956&r2=688957&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/timer/TimerFiredTimeTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/timer/TimerFiredTimeTest.java
Mon Aug 25 21:16:09 2008
@@ -34,7 +34,8 @@
Exchange exchange = mock.getExchanges().get(0);
assertEquals("hello",
exchange.getProperty("org.apache.camel.timer.name"));
-
assertNotNull(exchange.getProperty("org.apache.camel.timer.firedtime"));
+
assertNotNull(exchange.getProperty("org.apache.camel.timer.firedTime"));
+ assertNotNull(exchange.getIn().getHeader("firedTime"));
}
@Override
