svn commit: r1431834 - in /camel/branches/camel-2.10.x: ./ components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConstants.java components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyEndpoint.java

[ningjiang]

Author: ningjiang
Date: Fri Jan 11 02:51:47 2013
New Revision: 1431834

URL: http://svn.apache.org/viewvc?rev=1431834&view=rev
Log:
CAMEL-5955 Put the LocalAddress into the message header
Merged revisions 1431819 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1431819 | ningjiang | 2013-01-11 10:25:43 +0800 (Fri, 11 Jan 2013) | 1 line
  
  CAMEL-5955 Put the LocalAddress into the message header
........

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

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

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

Modified: 
camel/branches/camel-2.10.x/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConstants.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConstants.java?rev=1431834&r1=1431833&r2=1431834&view=diff
==============================================================================
--- 
camel/branches/camel-2.10.x/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConstants.java
 (original)
+++ 
camel/branches/camel-2.10.x/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConstants.java
 Fri Jan 11 02:51:47 2013
@@ -27,6 +27,7 @@ public final class NettyConstants {
     public static final String NETTY_CHANNEL_HANDLER_CONTEXT = 
"CamelNettyChannelHandlerContext";
     public static final String NETTY_MESSAGE_EVENT = "CamelNettyMessageEvent";
     public static final String NETTY_REMOTE_ADDRESS = 
"CamelNettyRemoteAddress";
+    public static final String NETTY_LOCAL_ADDRESS = "CamelNettyLocalAddress";
 
     private NettyConstants() {
         // Utility class

Modified: 
camel/branches/camel-2.10.x/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyEndpoint.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyEndpoint.java?rev=1431834&r1=1431833&r2=1431834&view=diff
==============================================================================
--- 
camel/branches/camel-2.10.x/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyEndpoint.java
 (original)
+++ 
camel/branches/camel-2.10.x/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyEndpoint.java
 Fri Jan 11 02:51:47 2013
@@ -54,6 +54,7 @@ public class NettyEndpoint extends Defau
         
exchange.getIn().setHeader(NettyConstants.NETTY_CHANNEL_HANDLER_CONTEXT, ctx);
         exchange.getIn().setHeader(NettyConstants.NETTY_MESSAGE_EVENT, 
messageEvent);
         exchange.getIn().setHeader(NettyConstants.NETTY_REMOTE_ADDRESS, 
messageEvent.getRemoteAddress());
+        exchange.getIn().setHeader(NettyConstants.NETTY_LOCAL_ADDRESS, 
messageEvent.getChannel().getLocalAddress());
         NettyPayloadHelper.setIn(exchange, messageEvent.getMessage());
         return exchange;
     }