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

Findbugs all over

Browse Source
This commit is contained in:
zzz
2018-08-26 13:50:40 +00:00
parent db54edc36d
commit 1f92232253
17 changed files with 56 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -898,6 +898,10 @@ public class WebMail extends HttpServlet
// because we may already have UIDLs in the MailCache to fetch
synchronized(_so) {
mc = _so.caches.get(DIR_FOLDER);
if (mc == null) {
_so.error += "Internal error, no folder\n";
return;
}
while (mc.isLoading()) {
try {
_so.wait(5000);
@@ -910,9 +914,7 @@ public class WebMail extends HttpServlet
if (log.shouldDebug()) log.debug("Done waiting for folder load");
// fetch the mail outside the lock
// TODO, would be better to add each email as we get it
if (mc != null) {
found = mc.getMail(MailCache.FetchMode.HEADER);
}
found = mc.getMail(MailCache.FetchMode.HEADER);
}
if (log.shouldDebug()) log.debug("CW.FNM connected? " + connected + " found? " + found);
synchronized(_so) {
@@ -2898,7 +2900,7 @@ public class WebMail extends HttpServlet
} else {
sessionObject.error += relay.error;
}
sessionObject.info.replace(_t("Sending mail.") + '\n', "");
sessionObject.info = sessionObject.info.replace(_t("Sending mail.") + '\n', "");
}
}
}
@@ -3377,7 +3379,7 @@ public class WebMail extends HttpServlet
out.println(button(DELETE, _t("Delete")));
}
out.println(button(LOGOUT, _t("Logout") ));
if (mail.hasBody() && !mc.getFolderName().equals(DIR_DRAFTS)) {
if (hasHeader && mail.hasBody() && !mc.getFolderName().equals(DIR_DRAFTS)) {
// can't move unless has body
// can't move from drafts
out.println(button(MOVE_TO, _t("Move to Folder") + ':'));