You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2011/09/19 23:25:03 UTC
svn commit: r1172839 - in /camel/branches/camel-2.8.x: ./
camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
camel-core/src/test/java/org/apache/camel/language/SimpleOgnlMapIssueTest.java
Author: dkulp
Date: Mon Sep 19 21:25:02 2011
New Revision: 1172839
URL: http://svn.apache.org/viewvc?rev=1172839&view=rev
Log:
Merged revisions 1160262 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1160262 | davsclaus | 2011-08-22 09:24:42 -0400 (Mon, 22 Aug 2011) | 1 line
CAMEL-4364: Simple language ognl map access now support keys with enclosing quotes.
........
Added:
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/language/SimpleOgnlMapIssueTest.java
- copied unchanged from r1160262, camel/trunk/camel-core/src/test/java/org/apache/camel/language/SimpleOgnlMapIssueTest.java
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java?rev=1172839&r1=1172838&r2=1172839&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java Mon Sep 19 21:25:02 2011
@@ -32,6 +32,7 @@ import org.apache.camel.component.bean.R
import org.apache.camel.util.KeyValueHolder;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.OgnlHelper;
+import org.apache.camel.util.StringHelper;
/**
* Evaluates an expression using a bean method invocation
@@ -234,9 +235,14 @@ public class BeanExpression implements E
}
private Object lookupResult(Exchange exchange, String key, Object result, boolean nullSafe, String ognlPath, Object bean) {
+ ObjectHelper.notEmpty(key, "key", "in Simple language ognl path: " + ognlPath);
+
// trim key
key = key.trim();
+ // remove any enclosing quotes
+ key = StringHelper.removeLeadingAndEndingQuotes(key);
+
// try map first
Map map = exchange.getContext().getTypeConverter().convertTo(Map.class, result);
if (map != null) {