Author: davsclaus
Date: Fri Nov 27 06:45:28 2009
New Revision: 884755
URL: http://svn.apache.org/viewvc?rev=884755&view=rev
Log:
Merged revisions 884750 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r884750 | davsclaus | 2009-11-27 07:30:59 +0100 (Fri, 27 Nov 2009) | 1 line
CAMEL-2232: Fixed mail component and multiple endpoints mixing up recipients
and only use from the last defined endpoint.
........
Added:
camel/branches/camel-1.x/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentRecipientSetTest.java
- copied, changed from r884750,
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentRecipientSetTest.java
camel/branches/camel-1.x/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailToMultipleEndpointsTest.java
- copied, changed from r884750,
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailToMultipleEndpointsTest.java
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
camel/branches/camel-1.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 27 06:45:28 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,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346,769368,769434,770172,770906,771303,773193,773446,773781,774192,774383,774658-774659,776198,776289,776504,776975,778102,778689-778701,779121,779143,779489,781314-781349,781775,781
923,781974,781993,782557,782594,782681,782886,782918-782923,783204,783248,783363,783639,783704,785564,785584,785599,787206,787581,787598,787605,787928,788393,789121,789703,790560,790936,791379,791476,791767,792038,792381,792398,792899,793359,793518,793547-793555,793862,793935,794237,794368,794550,794967,795790,798027,798052,798063,798489,798864,799252,800340,800785,800797,801084,801196,801960,802307,802478,803559,807476,810751,812937,814493,816105,817654,818063,818182-818354,818744,818747,819475,819956,820152,820168,821272,821290,822655,823013,823018,823031,823102,823177,823575,824218,824721,825760,825765,828288,828333,832647,833285,833289,833350,833370,833381,833419,835511,880655,880667,883713,884525
+/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,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346,769368,769434,770172,770906,771303,773193,773446,773781,774192,774383,774658-774659,776198,776289,776504,776975,778102,778689-778701,779121,779143,779489,781314-781349,781775,781
923,781974,781993,782557,782594,782681,782886,782918-782923,783204,783248,783363,783639,783704,785564,785584,785599,787206,787581,787598,787605,787928,788393,789121,789703,790560,790936,791379,791476,791767,792038,792381,792398,792899,793359,793518,793547-793555,793862,793935,794237,794368,794550,794967,795790,798027,798052,798063,798489,798864,799252,800340,800785,800797,801084,801196,801960,802307,802478,803559,807476,810751,812937,814493,816105,817654,818063,818182-818354,818744,818747,819475,819956,820152,820168,821272,821290,822655,823013,823018,823031,823102,823177,823575,824218,824721,825760,825765,828288,828333,832647,833285,833289,833350,833370,833381,833419,835511,880655,880667,883713,884525,884750
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-1.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java?rev=884755&r1=884754&r2=884755&view=diff
==============================================================================
---
camel/branches/camel-1.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
(original)
+++
camel/branches/camel-1.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailBinding.java
Fri Nov 27 06:45:28 2009
@@ -196,7 +196,7 @@
}
/**
- * Appends the Mail headers from the endpoint configuraiton.
+ * Appends the Mail headers from the endpoint configuration.
*/
protected void setRecipientFromEndpointConfiguration(MimeMessage
mimeMessage, MailEndpoint endpoint)
throws MessagingException {
Modified:
camel/branches/camel-1.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java?rev=884755&r1=884754&r2=884755&view=diff
==============================================================================
---
camel/branches/camel-1.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
(original)
+++
camel/branches/camel-1.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
Fri Nov 27 06:45:28 2009
@@ -71,7 +71,11 @@
*/
public MailConfiguration copy() {
try {
- return (MailConfiguration) clone();
+ MailConfiguration copy = (MailConfiguration) clone();
+ // must set a new recipients map as clone just reuse the same
reference
+ copy.recipients = new HashMap<Message.RecipientType, String>();
+ copy.recipients.putAll(this.recipients);
+ return copy;
} catch (CloneNotSupportedException e) {
throw new RuntimeCamelException(e);
}
Copied:
camel/branches/camel-1.x/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentRecipientSetTest.java
(from r884750,
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentRecipientSetTest.java)
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentRecipientSetTest.java?p2=camel/branches/camel-1.x/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentRecipientSetTest.java&p1=camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentRecipientSetTest.java&r1=884750&r2=884755&rev=884755&view=diff
==============================================================================
---
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentRecipientSetTest.java
(original)
+++
camel/branches/camel-1.x/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailComponentRecipientSetTest.java
Fri Nov 27 06:45:28 2009
@@ -18,17 +18,15 @@
import javax.mail.Message;
+import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
import org.jvnet.mock_javamail.Mailbox;
/**
* @version $Revision$
*/
-public class MailComponentRecipientSetTest extends CamelTestSupport {
+public class MailComponentRecipientSetTest extends ContextTestSupport {
- @Test
public void testMultipleEndpoints() throws Exception {
Mailbox.clearAll();
Copied:
camel/branches/camel-1.x/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailToMultipleEndpointsTest.java
(from r884750,
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailToMultipleEndpointsTest.java)
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailToMultipleEndpointsTest.java?p2=camel/branches/camel-1.x/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailToMultipleEndpointsTest.java&p1=camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailToMultipleEndpointsTest.java&r1=884750&r2=884755&rev=884755&view=diff
==============================================================================
---
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailToMultipleEndpointsTest.java
(original)
+++
camel/branches/camel-1.x/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailToMultipleEndpointsTest.java
Fri Nov 27 06:45:28 2009
@@ -18,17 +18,15 @@
import javax.mail.Message;
+import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
import org.jvnet.mock_javamail.Mailbox;
/**
* @version $Revision$
*/
-public class MailToMultipleEndpointsTest extends CamelTestSupport {
+public class MailToMultipleEndpointsTest extends ContextTestSupport {
- @Test
public void testMultipleEndpoints() throws Exception {
Mailbox.clearAll();
