Author: ningjiang Date: Fri Jan 11 13:38:46 2013 New Revision: 1432046 URL: http://svn.apache.org/viewvc?rev=1432046&view=rev Log: CAMEL-5954 removed the in varible which could cause some trouble on the script Merged revisions 1431939 via svnmerge from https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
................ r1431939 | ningjiang | 2013-01-11 16:49:45 +0800 (Fri, 11 Jan 2013) | 10 lines Merged revisions 1431933 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1431933 | ningjiang | 2013-01-11 16:27:53 +0800 (Fri, 11 Jan 2013) | 1 line CAMEL-5954 removed the in varible which could cause some trouble on the script ........ ................ Modified: camel/branches/camel-2.9.x/ (props changed) camel/branches/camel-2.9.x/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Merged /camel/trunk:r1431933 Merged /camel/branches/camel-2.10.x:r1431939 Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.9.x/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java?rev=1432046&r1=1432045&r2=1432046&view=diff ============================================================================== --- camel/branches/camel-2.9.x/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java (original) +++ camel/branches/camel-2.9.x/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java Fri Jan 11 13:38:46 2013 @@ -373,9 +373,9 @@ public class ScriptBuilder implements Ex context.setAttribute("camelContext", exchange.getContext(), scope); context.setAttribute("exchange", exchange, scope); Message in = exchange.getIn(); - context.setAttribute("in", in, scope); context.setAttribute("request", in, scope); context.setAttribute("headers", in.getHeaders(), scope); + context.setAttribute("body", in.getBody(), scope); if (exchange.hasOut()) { Message out = exchange.getOut(); context.setAttribute("out", out , scope);
