Author: davsclaus
Date: Tue Jun 23 10:58:26 2009
New Revision: 787632
URL: http://svn.apache.org/viewvc?rev=787632&view=rev
Log:
CAMEL-1748: camel-mail is now compatible with Spring 2.0.x
Modified:
camel/branches/camel-1.x/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
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=787632&r1=787631&r2=787632&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
Tue Jun 23 10:58:26 2009
@@ -110,12 +110,13 @@
// sets the debug mode of the underlying mail framework
answer.getSession().setDebug(debugMode);
- if (javaMailProperties != null) {
- answer.setJavaMailProperties(javaMailProperties);
- } else {
+ // java mail properties
+ Properties prop = javaMailProperties;
+ if (prop == null) {
// set default properties if none provided
- answer.setJavaMailProperties(createJavaMailProperties());
+ prop = createJavaMailProperties();
}
+ answer.setJavaMailProperties(prop);
if (defaultEncoding != null) {
answer.setDefaultEncoding(defaultEncoding);
@@ -136,7 +137,7 @@
answer.setSession(session);
} else {
// use our authenticator that does no live user interaction but
returns the already configured username and password
- Session session =
Session.getDefaultInstance(answer.getJavaMailProperties(), getAuthenticator());
+ Session session = Session.getDefaultInstance(prop,
getAuthenticator());
answer.setSession(session);
}
if (username != null) {
