svn commit: r1431840 - in /camel/branches/camel-2.10.x: ./ components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogDataFormat.java

[ningjiang]

Author: ningjiang
Date: Fri Jan 11 02:56:35 2013
New Revision: 1431840

URL: http://svn.apache.org/viewvc?rev=1431840&view=rev
Log:
CAMEL-5951 Fix the issue of Camel-syslog dataformat broken with camel-netty
Merged revisions 1431820 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1431820 | ningjiang | 2013-01-11 10:26:10 +0800 (Fri, 11 Jan 2013) | 1 line
  
  CAMEL-5951 Fix the issue of Camel-syslog dataformat broken with camel-netty
........

Modified:
    camel/branches/camel-2.10.x/   (props changed)
    
camel/branches/camel-2.10.x/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogDataFormat.java

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1431820

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.10.x/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogDataFormat.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogDataFormat.java?rev=1431840&r1=1431839&r2=1431840&view=diff
==============================================================================
--- 
camel/branches/camel-2.10.x/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogDataFormat.java
 (original)
+++ 
camel/branches/camel-2.10.x/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/Rfc3164SyslogDataFormat.java
 Fri Jan 11 02:56:35 2013
@@ -52,9 +52,14 @@ public class Rfc3164SyslogDataFormat imp
             
message.setRemoteAddress(exchange.getIn().getHeader("CamelMinaRemoteAddress", 
String.class));
             exchange.getOut().setHeader(SyslogConstants.SYSLOG_REMOTE_ADDRESS, 
message.getRemoteAddress());
         }
+        
+        if (exchange.getIn().getHeader("CamelNettyLocalAddress") != null) {
+            
message.setRemoteAddress(exchange.getIn().getHeader("CamelNettyLocalAddress", 
String.class));
+            exchange.getOut().setHeader(SyslogConstants.SYSLOG_LOCAL_ADDRESS, 
message.getRemoteAddress());
+        }
 
         if (exchange.getIn().getHeader("CamelNettyRemoteAddress") != null) {
-            
message.setRemoteAddress(exchange.getIn().getHeader("CamelMinaRemoteAddress", 
String.class));
+            
message.setRemoteAddress(exchange.getIn().getHeader("CamelNettyRemoteAddress", 
String.class));
             exchange.getOut().setHeader(SyslogConstants.SYSLOG_REMOTE_ADDRESS, 
message.getRemoteAddress());
         }