Author: davsclaus
Date: Wed Feb 15 15:00:53 2012
New Revision: 1244525
URL: http://svn.apache.org/viewvc?rev=1244525&view=rev
Log:
CAMEL-5005: Fixed NPE when empty expression evaluated by simple language.
Added:
camel/branches/camel-2.9.x/components/camel-spring/src/test/java/org/apache/camel/language/SpringSimpleEmptyStringTest.java
- copied unchanged from r1244518,
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/language/SpringSimpleEmptyStringTest.java
camel/branches/camel-2.9.x/components/camel-spring/src/test/resources/org/apache/camel/language/SpringSimpleEmptyStringTest.xml
- copied unchanged from r1244518,
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/language/SpringSimpleEmptyStringTest.xml
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 15 15:00:53 2012
@@ -1 +1 @@
-/camel/trunk:1243046,1243057,1243234
+/camel/trunk:1243046,1243057,1243234,1244518
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java?rev=1244525&r1=1244524&r2=1244525&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java
(original)
+++
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java
Wed Feb 15 15:00:53 2012
@@ -441,4 +441,24 @@ public final class PredicateBuilder {
}
return answer;
}
+
+ /**
+ * A constant predicate.
+ *
+ * @param answer the constant matches
+ * @return a predicate that always returns the given answer.
+ */
+ public static Predicate constant(final boolean answer) {
+ return new Predicate() {
+ @Override
+ public boolean matches(Exchange exchange) {
+ return answer;
+ }
+
+ @Override
+ public String toString() {
+ return "" + answer;
+ }
+ };
+ }
}
Modified:
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java?rev=1244525&r1=1244524&r2=1244525&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java
(original)
+++
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java
Wed Feb 15 15:00:53 2012
@@ -79,7 +79,8 @@ public class SimpleExpressionParser exte
// create and return as a Camel expression
List<Expression> expressions = createExpressions();
if (expressions.isEmpty()) {
- return null;
+ // return an empty string as response as there was nothing to parse
+ return ExpressionBuilder.constantExpression("");
} else if (expressions.size() == 1) {
return expressions.get(0);
} else {
Modified:
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java?rev=1244525&r1=1244524&r2=1244525&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java
(original)
+++
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java
Wed Feb 15 15:00:53 2012
@@ -21,6 +21,7 @@ import org.apache.camel.IsSingleton;
import org.apache.camel.Predicate;
import org.apache.camel.builder.ExpressionBuilder;
import org.apache.camel.spi.Language;
+import org.apache.camel.util.ObjectHelper;
/**
* A <a href="http://camel.apache.org/simple.html">simple language</a>
@@ -126,6 +127,8 @@ public class SimpleLanguage implements L
}
public Predicate createPredicate(String expression) {
+ ObjectHelper.notNull(expression, "expression");
+
// trim the expression first
expression = expression.trim();
// support old simple language syntax
@@ -140,6 +143,8 @@ public class SimpleLanguage implements L
}
public Expression createExpression(String expression) {
+ ObjectHelper.notNull(expression, "expression");
+
// trim the expression first
expression = expression.trim();
// support old simple language syntax
Modified:
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java?rev=1244525&r1=1244524&r2=1244525&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
(original)
+++
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
Wed Feb 15 15:00:53 2012
@@ -112,7 +112,8 @@ public class SimplePredicateParser exten
// create and return as a Camel predicate
List<Predicate> predicates = createPredicates();
if (predicates.isEmpty()) {
- return null;
+ // return a false predicate as response as there was nothing to
parse
+ return PredicateBuilder.constant(false);
} else if (predicates.size() == 1) {
return predicates.get(0);
} else {
Modified:
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java?rev=1244525&r1=1244524&r2=1244525&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
(original)
+++
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
Wed Feb 15 15:00:53 2012
@@ -75,6 +75,26 @@ public class SimpleTest extends Language
assertExpression("Hello World", "Hello World");
}
+ public void testEmptyExpression() throws Exception {
+ assertExpression("", "");
+ assertExpression(" ", "");
+ try {
+ assertExpression(null, null);
+ fail("Should have thrown exception");
+ } catch (IllegalArgumentException e) {
+ assertEquals("expression must be specified", e.getMessage());
+ }
+
+ assertPredicate("", false);
+ assertPredicate(" ", false);
+ try {
+ assertPredicate(null, false);
+ fail("Should have thrown exception");
+ } catch (IllegalArgumentException e) {
+ assertEquals("expression must be specified", e.getMessage());
+ }
+ }
+
public void testBodyExpression() throws Exception {
Expression exp = SimpleLanguage.simple("${body}");
assertNotNull(exp);