Repository: camel Updated Branches: refs/heads/camel-2.14.x 539273bf6 -> 2d8148efb refs/heads/master 5827b3d50 -> 1ad23d044
CAMEL-7882: camel-syslog timestamp header should be java.util.Date as it was before. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1ad23d04 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1ad23d04 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1ad23d04 Branch: refs/heads/master Commit: 1ad23d044c389a8121b9ff5d280dd2b17884311e Parents: 5827b3d Author: Claus Ibsen <davscl...@apache.org> Authored: Sun Nov 30 16:29:44 2014 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun Nov 30 16:29:44 2014 +0100 ---------------------------------------------------------------------- .../org/apache/camel/component/syslog/SyslogDataFormat.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/1ad23d04/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogDataFormat.java ---------------------------------------------------------------------- diff --git a/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogDataFormat.java b/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogDataFormat.java index cdc2146..399d8ab 100644 --- a/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogDataFormat.java +++ b/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/SyslogDataFormat.java @@ -18,6 +18,7 @@ package org.apache.camel.component.syslog; import java.io.InputStream; import java.io.OutputStream; +import java.util.Date; import org.apache.camel.Exchange; import org.apache.camel.spi.DataFormat; @@ -39,7 +40,11 @@ public class SyslogDataFormat implements DataFormat { exchange.getOut().setHeader(SyslogConstants.SYSLOG_FACILITY, message.getFacility()); exchange.getOut().setHeader(SyslogConstants.SYSLOG_SEVERITY, message.getSeverity()); exchange.getOut().setHeader(SyslogConstants.SYSLOG_HOSTNAME, message.getHostname()); - exchange.getOut().setHeader(SyslogConstants.SYSLOG_TIMESTAMP, message.getTimestamp()); + // use java.util.Date as timestamp + Date time = message.getTimestamp() != null ? message.getTimestamp().getTime() : null; + if (time != null) { + exchange.getOut().setHeader(SyslogConstants.SYSLOG_TIMESTAMP, time); + } // Since we are behind the fact of being in an Endpoint... // We need to pull in the remote/local via either Mina or Netty.
