Author: norman
Date: Tue Dec 28 21:07:04 2010
New Revision: 1053435
URL: http://svn.apache.org/viewvc?rev=1053435&view=rev
Log:
Fix NPE when try to send mail via FetchMail. See JAMES-1158
Modified:
james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java
james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java
Modified:
james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java?rev=1053435&r1=1053434&r2=1053435&view=diff
==============================================================================
---
james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java
(original)
+++
james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java
Tue Dec 28 21:07:04 2010
@@ -434,7 +434,7 @@ public class FetchMail implements Runnab
configuration,
logger,
getLocalUsers(),
- getDNSService(), getDomainList());
+ getDNSService(), getDomainList(), getMailQueue());
setParsedConfiguration(parsedConfiguration);
Modified:
james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java?rev=1053435&r1=1053434&r2=1053435&view=diff
==============================================================================
---
james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java
(original)
+++
james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java
Tue Dec 28 21:07:04 2010
@@ -326,13 +326,14 @@ class ParsedConfiguration
* @param dnsServer
* @throws ConfigurationException
*/
- public ParsedConfiguration(HierarchicalConfiguration configuration, Log
logger, UsersRepository localUsers,DNSService dnsServer, DomainList domainList)
throws ConfigurationException
+ public ParsedConfiguration(HierarchicalConfiguration configuration, Log
logger, UsersRepository localUsers,DNSService dnsServer, DomainList domainList,
MailQueue queue) throws ConfigurationException
{
this();
setLogger(logger);
setLocalUsers(localUsers);
setDNSServer(dnsServer);
setDomainList(domainList);
+ setMailQueue(queue);
configure(configuration);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
