Author: norman
Date: Tue Dec 28 19:34:38 2010
New Revision: 1053413
URL: http://svn.apache.org/viewvc?rev=1053413&view=rev
Log:
Fix NPE in FetchMail... Next attempt ;) . See JAMES-1157
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=1053413&r1=1053412&r2=1053413&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 19:34:38 2010
@@ -434,8 +434,7 @@ public class FetchMail implements Runnab
configuration,
logger,
getLocalUsers(),
- getDNSService());
- parsedConfiguration.setDomainList(domainList);
+ getDNSService(), getDomainList());
setParsedConfiguration(parsedConfiguration);
@@ -992,4 +991,7 @@ public class FetchMail implements Runnab
this.domainList = domainList;
}
+ public DomainList getDomainList() {
+ return domainList;
+ }
}
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=1053413&r1=1053412&r2=1053413&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 19:34:38 2010
@@ -326,12 +326,13 @@ class ParsedConfiguration
* @param dnsServer
* @throws ConfigurationException
*/
- public ParsedConfiguration(HierarchicalConfiguration configuration, Log
logger, UsersRepository localUsers,DNSService dnsServer) throws
ConfigurationException
+ public ParsedConfiguration(HierarchicalConfiguration configuration, Log
logger, UsersRepository localUsers,DNSService dnsServer, DomainList domainList)
throws ConfigurationException
{
this();
setLogger(logger);
setLocalUsers(localUsers);
setDNSServer(dnsServer);
+ setDomainList(domainList);
configure(configuration);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
