Author: alexlehm Date: 2008-04-12 14:12:34 +0000 (Sat, 12 Apr 2008) New Revision: 19231
Modified: trunk/apps/Freemail/src/freemail/Freemail.java trunk/apps/Freemail/src/freemail/FreemailCli.java trunk/apps/Freemail/src/freemail/FreemailPlugin.java Log: 0002262: NPE when sending mail (https://bugs.freenetproject.org/view.php?id=2262) change call order of startWorkers and startServers Modified: trunk/apps/Freemail/src/freemail/Freemail.java =================================================================== --- trunk/apps/Freemail/src/freemail/Freemail.java 2008-04-12 14:01:07 UTC (rev 19230) +++ trunk/apps/Freemail/src/freemail/Freemail.java 2008-04-12 14:12:34 UTC (rev 19231) @@ -130,6 +130,8 @@ fcpThread.start(); } + // note that this relies on sender being initialized + // (so startWorkers has to be called before) protected void startServers(boolean daemon) { // start the SMTP Listener smtpl = new SMTPListener(sender, configurator); Modified: trunk/apps/Freemail/src/freemail/FreemailCli.java =================================================================== --- trunk/apps/Freemail/src/freemail/FreemailCli.java 2008-04-12 14:01:07 UTC (rev 19230) +++ trunk/apps/Freemail/src/freemail/FreemailCli.java 2008-04-12 14:12:34 UTC (rev 19231) @@ -123,7 +123,7 @@ return; } + freemail.startWorkers(false); freemail.startServers(false); - freemail.startWorkers(false); } } Modified: trunk/apps/Freemail/src/freemail/FreemailPlugin.java =================================================================== --- trunk/apps/Freemail/src/freemail/FreemailPlugin.java 2008-04-12 14:01:07 UTC (rev 19230) +++ trunk/apps/Freemail/src/freemail/FreemailPlugin.java 2008-04-12 14:12:34 UTC (rev 19231) @@ -47,8 +47,8 @@ pluginResp = pr; startFcp(true); + startWorkers(true); startServers(true); - startWorkers(true); } public String handleHTTPGet(HTTPRequest request) throws PluginHTTPException {
