Return-Path: Delivered-To: apmail-camel-commits-archive@www.apache.org Received: (qmail 66703 invoked from network); 3 Mar 2009 15:31:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Mar 2009 15:31:26 -0000 Received: (qmail 27062 invoked by uid 500); 3 Mar 2009 15:31:26 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 27017 invoked by uid 500); 3 Mar 2009 15:31:26 -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 27005 invoked by uid 99); 3 Mar 2009 15:31:26 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Mar 2009 07:31:26 -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.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Mar 2009 15:31:24 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DD740238896B; Tue, 3 Mar 2009 15:31:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r749631 - in /camel/branches/camel-1.x: ./ components/camel-jms/src/main/java/org/apache/camel/component/jms/ components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/ Date: Tue, 03 Mar 2009 15:31:01 -0000 To: commits@camel.apache.org From: ningjiang@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090303153102.DD740238896B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ningjiang Date: Tue Mar 3 15:30:58 2009 New Revision: 749631 URL: http://svn.apache.org/viewvc?rev=749631&view=rev Log: Merged revisions 749628-749629 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r749628 | ningjiang | 2009-03-03 23:18:21 +0800 (Tue, 03 Mar 2009) | 1 line CAMEL-1414 Applied patch with thanks to Nicolas, also fixed the same issue in camel-spring-integration ........ r749629 | ningjiang | 2009-03-03 23:20:28 +0800 (Tue, 03 Mar 2009) | 1 line CAMEL-1414 Fixed the same issue in camel-spring-integration ........ Modified: camel/branches/camel-1.x/ (props changed) camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java camel/branches/camel-1.x/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java Propchange: camel/branches/camel-1.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Mar 3 15:30:58 2009 @@ -1 +1 @@ -/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574 +/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629 Propchange: camel/branches/camel-1.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java?rev=749631&r1=749630&r2=749631&view=diff ============================================================================== --- camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java (original) +++ camel/branches/camel-1.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java Tue Mar 3 15:30:58 2009 @@ -77,6 +77,7 @@ } setBody(that.getBody()); getHeaders().putAll(that.getHeaders()); + getAttachments().putAll(that.getAttachments()); } /** Modified: camel/branches/camel-1.x/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java?rev=749631&r1=749630&r2=749631&view=diff ============================================================================== --- camel/branches/camel-1.x/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java (original) +++ camel/branches/camel-1.x/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationMessage.java Tue Mar 3 15:30:58 2009 @@ -56,6 +56,7 @@ SpringIntegrationMessage orig = (SpringIntegrationMessage) that; setMessage(orig.getMessage()); } + getAttachments().putAll(that.getAttachments()); } @Override