zzz/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

SusiMail: Fix dup ConnectWaiter run, no failure message

Browse Source
This commit is contained in:
zzz
2018-05-30 19:46:51 +00:00
parent 3f2fe39515
commit a7db82a1fa
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/susimail/src/src/i2p/susi/webmail/WebMail.java
View File

@@ -896,7 +896,6 @@ public class WebMail extends HttpServlet
boolean found = false; boolean found = false;
Log log = _so.log; Log log = _so.log;
if (connected) { if (connected) {
if (log.shouldDebug()) log.debug("CONNECTED, YAY");
// we do this whether new mail was found or not, // we do this whether new mail was found or not,
// because we may already have UIDLs in the MailCache to fetch // because we may already have UIDLs in the MailCache to fetch
synchronized(_so) { synchronized(_so) {
@@ -916,9 +915,8 @@ public class WebMail extends HttpServlet
if (mc != null) { if (mc != null) {
found = mc.getMail(MailCache.FetchMode.HEADER); found = mc.getMail(MailCache.FetchMode.HEADER);
} }
} else {
if (log.shouldDebug()) log.debug("NOT CONNECTED, BOO");
} }
if (log.shouldDebug()) log.debug("CW.FNM connected? " + connected + " found? " + found);
synchronized(_so) { synchronized(_so) {
if (!connected) { if (!connected) {
String error = _mb.lastError(); String error = _mb.lastError();
@@ -1378,10 +1376,7 @@ public class WebMail extends HttpServlet
sessionObject.isFetching = true; sessionObject.isFetching = true;
ConnectWaiter cw = new ConnectWaiter(sessionObject); ConnectWaiter cw = new ConnectWaiter(sessionObject);
if (mailbox.connectToServer(cw)) { if (mailbox.connectToServer(cw)) {
// Start a thread to wait for results // mailbox will callback to cw
if (log.shouldDebug()) log.debug("Already connected, running CW");
Thread t = new I2PAppThread(cw, "Email fetcher");
t.start();
} else { } else {
sessionObject.error += _t("Cannot connect") + '\n'; sessionObject.error += _t("Cannot connect") + '\n';
sessionObject.isFetching = false; sessionObject.isFetching = false;