Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 452BAE9D4 for ; Fri, 11 Jan 2013 13:39:08 +0000 (UTC) Received: (qmail 38390 invoked by uid 500); 11 Jan 2013 13:39:08 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 38361 invoked by uid 500); 11 Jan 2013 13:39:08 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 38354 invoked by uid 99); 11 Jan 2013 13:39:07 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Jan 2013 13:39:07 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Jan 2013 13:39:06 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 07F8C2388A29; Fri, 11 Jan 2013 13:38:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1432046 - in /camel/branches/camel-2.9.x: ./ components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java Date: Fri, 11 Jan 2013 13:38:46 -0000 To: commits@camel.apache.org From: ningjiang@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130111133847.07F8C2388A29@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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);