Author: davsclaus
Date: Sun Jul 20 00:24:35 2008
New Revision: 678256
URL: http://svn.apache.org/viewvc?rev=678256&view=rev
Log:
Fixed NPE if username isn't set (put null in properties)
Modified:
activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
Modified:
activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java?rev=678256&r1=678255&r2=678256&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
(original)
+++
activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java
Sun Jul 20 00:24:35 2008
@@ -143,13 +143,15 @@
properties.put("mail." + protocol + ".timeout", connectionTimeout);
properties.put("mail." + protocol + ".host", host);
properties.put("mail." + protocol + ".port", "" + port);
- properties.put("mail." + protocol + ".user", username);
+ if (username != null) {
+ properties.put("mail." + protocol + ".user", username);
+ properties.put("mail.user", username);
+ }
properties.put("mail." + protocol + ".rsetbeforequit", "true");
properties.put("mail." + protocol + ".auth", "true");
properties.put("mail.transport.protocol", protocol);
properties.put("mail.store.protocol", protocol);
properties.put("mail.host", host);
- properties.put("mail.user", username);
if (debugMode) {
// add more debug for the SSL communication as well
