Author: ningjiang
Date: Fri Aug 26 13:13:18 2011
New Revision: 1162105
URL: http://svn.apache.org/viewvc?rev=1162105&view=rev
Log:
Merged revisions 1160637 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1160637 | ningjiang | 2011-08-23 19:38:32 +0800 (Tue, 23 Aug 2011) | 1 line
CAMEL-4367 made the Camel-netty option encoder and decoder work
........
Added:
camel/branches/camel-2.8.x/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySingleCodecTest.java
- copied unchanged from r1160637,
camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySingleCodecTest.java
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 26 13:13:18 2011
@@ -1 +1 @@
-/camel/trunk:1150651,1151054,1155230,1156108,1156260,1156524,1157348,1157798,1157831,1157878,1158153,1159171,1159174,1159457,1159460,1159606,1159867,1160547,1161010,1161082,1161524
+/camel/trunk:1150651,1151054,1155230,1156108,1156260,1156524,1157348,1157798,1157831,1157878,1158153,1159171,1159174,1159457,1159460,1159606,1159867,1160547,1160637,1161010,1161082,1161524
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.8.x/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java?rev=1162105&r1=1162104&r2=1162105&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java
(original)
+++
camel/branches/camel-2.8.x/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java
Fri Aug 26 13:13:18 2011
@@ -122,6 +122,7 @@ public class NettyConfiguration implemen
addToHandlersList(decoders, referencedDecoders,
ChannelUpstreamHandler.class);
// then set parameters with the help of the camel context type
converters
+ EndpointHelper.setReferenceProperties(component.getCamelContext(),
this, parameters);
EndpointHelper.setProperties(component.getCamelContext(), this,
parameters);
// add default encoders and decoders
