Author: ningjiang Date: Sat Jan 19 06:55:03 2013 New Revision: 1435499 URL: http://svn.apache.org/viewvc?rev=1435499&view=rev Log: CAMEL-5951 fixed the typo error of setLocalAddress. Merged revisions 1435498 via svnmerge from https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
................ r1435498 | ningjiang | 2013-01-19 14:48:20 +0800 (Sat, 19 Jan 2013) | 10 lines Merged revisions 1435497 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1435497 | ningjiang | 2013-01-19 14:37:13 +0800 (Sat, 19 Jan 2013) | 1 line CAMEL-5951 fixed the typo error of setLocalAddress. ........ ................ Modified: camel/branches/camel-2.9.x/ (props changed) camel/branches/camel-2.9.x/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogDataFormat.java Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Merged /camel/trunk:r1435497 Merged /camel/branches/camel-2.10.x:r1435498 Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.9.x/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogDataFormat.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogDataFormat.java?rev=1435499&r1=1435498&r2=1435499&view=diff ============================================================================== --- camel/branches/camel-2.9.x/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogDataFormat.java (original) +++ camel/branches/camel-2.9.x/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogDataFormat.java Sat Jan 19 06:55:03 2013 @@ -54,8 +54,8 @@ public class Rfc3164SyslogDataFormat imp } if (exchange.getIn().getHeader("CamelNettyLocalAddress") != null) { - message.setRemoteAddress(exchange.getIn().getHeader("CamelNettyLocalAddress", String.class)); - exchange.getOut().setHeader(SyslogConstants.SYSLOG_LOCAL_ADDRESS, message.getRemoteAddress()); + message.setLocalAddress(exchange.getIn().getHeader("CamelNettyLocalAddress", String.class)); + exchange.getOut().setHeader(SyslogConstants.SYSLOG_LOCAL_ADDRESS, message.getLocalAddress()); } if (exchange.getIn().getHeader("CamelNettyRemoteAddress") != null) {
