Author: davsclaus
Date: Tue May 29 14:50:20 2012
New Revision: 1343759
URL: http://svn.apache.org/viewvc?rev=1343759&view=rev
Log:
CAMEL-5317: Fixed potential NPE in netty converter. Thanks to Lukasz for the
patch.
Added:
camel/branches/camel-2.9.x/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConverterTest.java
- copied unchanged from r1343758,
camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConverterTest.java
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConverter.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1343758
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.9.x/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConverter.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConverter.java?rev=1343759&r1=1343758&r2=1343759&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConverter.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConverter.java
Tue May 29 14:50:20 2012
@@ -48,7 +48,10 @@ public final class NettyConverter {
public static String toString(ChannelBuffer buffer, Exchange exchange) {
byte[] bytes = toByteArray(buffer);
// use type converter as it can handle encoding set on the Exchange
- return
exchange.getContext().getTypeConverter().convertTo(String.class, exchange,
bytes);
+ if (exchange != null) {
+ return
exchange.getContext().getTypeConverter().convertTo(String.class, exchange,
bytes);
+ }
+ return new String(bytes);
}
@Converter
