Return-Path: Delivered-To: apmail-activemq-camel-commits-archive@locus.apache.org Received: (qmail 10378 invoked from network); 7 Feb 2008 19:48:01 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 7 Feb 2008 19:48:01 -0000 Received: (qmail 42100 invoked by uid 500); 7 Feb 2008 19:47:54 -0000 Delivered-To: apmail-activemq-camel-commits-archive@activemq.apache.org Received: (qmail 42084 invoked by uid 500); 7 Feb 2008 19:47:54 -0000 Mailing-List: contact camel-commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: camel-dev@activemq.apache.org Delivered-To: mailing list camel-commits@activemq.apache.org Received: (qmail 42075 invoked by uid 99); 7 Feb 2008 19:47:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Feb 2008 11:47:54 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Feb 2008 19:47:46 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 38D501A9832; Thu, 7 Feb 2008 11:47:38 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r619603 - in /activemq/camel/trunk/components/camel-ognl/src: main/java/org/apache/camel/language/ognl/OgnlExpression.java test/java/org/apache/camel/language/ognl/OgnlTest.java Date: Thu, 07 Feb 2008 19:47:35 -0000 To: camel-commits@activemq.apache.org From: hadrian@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080207194738.38D501A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hadrian Date: Thu Feb 7 11:47:22 2008 New Revision: 619603 URL: http://svn.apache.org/viewvc?rev=619603&view=rev Log: CAMEL-310. Patch applied with thanks! Modified: activemq/camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlExpression.java activemq/camel/trunk/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlTest.java Modified: activemq/camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlExpression.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlExpression.java?rev=619603&r1=619602&r2=619603&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlExpression.java (original) +++ activemq/camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlExpression.java Thu Feb 7 11:47:22 2008 @@ -57,20 +57,12 @@ // TODO we could use caching here but then we'd have possible // concurrency issues // so lets assume that the provider caches - Map values = new HashMap(); - populateContext(values, exchange); OgnlContext oglContext = new OgnlContext(); try { return Ognl.getValue(expression, oglContext, new RootObject(exchange)); } catch (OgnlException e) { throw new ExpressionEvaluationException(this, exchange, e); } - } - - protected void populateContext(Map map, Exchange exchange) { - map.put("exchange", exchange); - map.put("in", exchange.getIn()); - map.put("out", exchange.getOut()); } protected String assertionFailureMessage(Exchange exchange) { Modified: activemq/camel/trunk/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlTest.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlTest.java?rev=619603&r1=619602&r2=619603&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlTest.java (original) +++ activemq/camel/trunk/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlTest.java Thu Feb 7 11:47:22 2008 @@ -18,18 +18,28 @@ import org.apache.camel.LanguageTestSupport; - /** * @version $Revision: $ */ public class OgnlTest extends LanguageTestSupport { - public void testElExpressions() throws Exception { + public void testOgnlExpressions() throws Exception { assertExpression("exchange", exchange); assertExpression("exchange.getIn().body", "world!"); assertExpression("getIn().body", "world!"); + assertExpression("request.body", "world!"); assertExpression("getIn().headers['foo']", "abc"); assertExpression("getIn().headers.foo", "abc"); assertExpression("request.headers.foo", "abc"); + } + + public void testGetOutFalseKeepsNullOutMessage() throws Exception { + assertExpression("exchange.getOut(false)", null); + assertNull(exchange.getOut(false)); + } + + public void testResponseCreatesOutMessage() throws Exception { + assertExpression("response.body", null); + assertNotNull(exchange.getOut(false)); } protected String getLanguageName() {