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/02/03 14:24:34 UTC
svn commit: r740300 -
/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/language/simple/FileExpressionBuilder.java
Author: davsclaus
Date: Tue Feb 3 13:24:34 2009
New Revision: 740300
URL: http://svn.apache.org/viewvc?rev=740300&view=rev
Log:
Fixed potential NPE using file languages for files with no extension
Modified:
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/language/simple/FileExpressionBuilder.java
Modified: camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/language/simple/FileExpressionBuilder.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/language/simple/FileExpressionBuilder.java?rev=740300&r1=740299&r2=740300&view=diff
==============================================================================
--- camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/language/simple/FileExpressionBuilder.java (original)
+++ camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/language/simple/FileExpressionBuilder.java Tue Feb 3 13:24:34 2009
@@ -57,10 +57,11 @@
return new Expression<E>() {
public Object evaluate(E exchange) {
String name = exchange.getIn().getHeader("CamelFileName", String.class);
- if (name != null) {
+ if (name.lastIndexOf(".") != -1) {
return name.substring(0, name.lastIndexOf('.'));
} else {
- return null;
+ // name does not have extension
+ return name;
}
}