svn commit: r595309 - in /activemq/camel/trunk/components/camel-juel/src: main/java/org/apache/camel/language/juel/JuelExpression.java test/java/org/apache/camel/language/juel/NullBodyTest.java

[js...@apache.org]

Author: jstrachan
Date: Thu Nov 15 06:18:54 2007
New Revision: 595309

URL: http://svn.apache.org/viewvc?rev=595309&view=rev
Log:
added test case and fix for Arjan's issue : http://www.nabble.com/setBody%28el%28-%29%29-creates-null-body-tf4805396s22882.html#a13747750

Added:
    activemq/camel/trunk/components/camel-juel/src/test/java/org/apache/camel/language/juel/NullBodyTest.java   (with props)
Modified:
    activemq/camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/JuelExpression.java

Modified: activemq/camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/JuelExpression.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/JuelExpression.java?rev=595309&r1=595308&r2=595309&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/JuelExpression.java (original)
+++ activemq/camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/JuelExpression.java Thu Nov 15 06:18:54 2007
@@ -69,7 +69,8 @@
     protected ELContext populateContext(ELContext context, Exchange exchange) {
         setVariable(context, "exchange", exchange, Exchange.class);
         setVariable(context, "in", exchange.getIn(), Message.class);
-        setVariable(context, "out", exchange.getOut(), Message.class);
+        Message out = exchange.getOut(false);
+        setVariable(context, "out", out, Message.class);
         return context;
     }
 

Added: activemq/camel/trunk/components/camel-juel/src/test/java/org/apache/camel/language/juel/NullBodyTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-juel/src/test/java/org/apache/camel/language/juel/NullBodyTest.java?rev=595309&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-juel/src/test/java/org/apache/camel/language/juel/NullBodyTest.java (added)
+++ activemq/camel/trunk/components/camel-juel/src/test/java/org/apache/camel/language/juel/NullBodyTest.java Thu Nov 15 06:18:54 2007
@@ -0,0 +1,53 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.language.juel;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import static org.apache.camel.language.juel.JuelExpression.el;
+
+/**
+ * @author Albert Moraal
+ * @version $Revision: 1.1 $
+ */
+public class NullBodyTest extends ContextTestSupport {
+    public void testNullBody() throws Exception {
+        MockEndpoint resultEndpoint = getMockEndpoint("mock:After");
+
+        resultEndpoint.expectedBodiesReceived("xxtestbodyxx");
+
+        template.sendBody("seda:nullbodytest", "testbody");
+
+        resultEndpoint.assertIsSatisfied();
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() {
+                from("seda:nullbodytest")
+                        .to("mock:Before")
+                        //.setBody().el("xx${in.body}xx")
+                        .setBody(el("xx${in.body}xx"))
+                        .to("mock:After");
+            }
+        };
+    }
+}

Propchange: activemq/camel/trunk/components/camel-juel/src/test/java/org/apache/camel/language/juel/NullBodyTest.java
------------------------------------------------------------------------------
    svn:eol-style = native