You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2009/04/04 12:10:59 UTC
svn commit: r761885 -
/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConverter.java
Author: davsclaus
Date: Sat Apr 4 10:10:59 2009
New Revision: 761885
URL: http://svn.apache.org/viewvc?rev=761885&view=rev
Log:
Fixed NPE if exchange was null, eg from mina UDP codec
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConverter.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConverter.java?rev=761885&r1=761884&r2=761885&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConverter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConverter.java Sat Apr 4 10:10:59 2009
@@ -61,7 +61,12 @@
@Converter
public static String convertToString(GenericFile file, Exchange exchange) {
- return exchange.getContext().getTypeConverter().convertTo(String.class, file.getBody());
+ if (exchange != null) {
+ return exchange.getContext().getTypeConverter().convertTo(String.class, file.getBody());
+ } else {
+ // should revert to fallback converter if we dont have an exchange
+ return null;
+ }
}
}