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

Susimail: Don't let an exception on one mail break others

Browse Source
This commit is contained in:
zzz
2014-05-13 21:36:06 +00:00
parent e393f82eb7
commit df71308664
5 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/susimail/src/src/i2p/susi/webmail/Mail.java
View File

@ -118,6 +118,8 @@ class Mail {
part = new MailPart(rb); part = new MailPart(rb);
} catch (DecodingException de) { } catch (DecodingException de) {
Debug.debug(Debug.ERROR, "Decode error: " + de); Debug.debug(Debug.ERROR, "Decode error: " + de);
} catch (Exception e) {
Debug.debug(Debug.ERROR, "Parse error: " + e);
} }
} }

3
apps/susimail/src/src/i2p/susi/webmail/PersistentMailCache.java
View File

@ -282,6 +282,9 @@ class PersistentMailCache {
} catch (IOException ioe) { } catch (IOException ioe) {
Debug.debug(Debug.ERROR, "Error reading: " + f + ": " + ioe); Debug.debug(Debug.ERROR, "Error reading: " + f + ": " + ioe);
return null; return null;
} catch (OutOfMemoryError oom) {
Debug.debug(Debug.ERROR, "Error reading: " + f + ": " + oom);
return null;
} finally { } finally {
if (in != null) if (in != null)
try { in.close(); } catch (IOException ioe) {} try { in.close(); } catch (IOException ioe) {}

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

@ -237,9 +237,15 @@ public class POP3MailBox implements NewMailListener {
Integer idObj = Integer.valueOf(id); Integer idObj = Integer.valueOf(id);
ReadBuffer body = null; ReadBuffer body = null;
if (id >= 1 && id <= mails) { if (id >= 1 && id <= mails) {
body = sendCmdN( "RETR " + id ); try {
if (body == null) body = sendCmdN( "RETR " + id );
Debug.debug( Debug.DEBUG, "RETR returned null" ); if (body == null)
Debug.debug( Debug.DEBUG, "RETR returned null" );
} catch (OutOfMemoryError oom) {
Debug.debug( Debug.ERROR, "OOM fetching mail" );
lastError = oom.toString();
close();
}
} }
else { else {
lastError = "Message id out of range."; lastError = "Message id out of range.";

5
history.txt
View File

@ -1,6 +1,9 @@
2014-05-13 zzz 2014-05-13 zzz
* BOB, SAM, i2psnark: Fix datagram NPE (ticket #1275) * BOB, SAM, i2psnark: Fix datagram NPE (ticket #1275)
* SusiMail: Fix AIOOBE (ticket #1269) * i2psnark: Escaping fixes on details page
* SusiMail:
- Fix AIOOBE (ticket #1269)
- Don't let an exception on one mail break others
2014-05-10 zzz 2014-05-10 zzz
* NTCP: Fix NPE (ticket #996) * NTCP: Fix NPE (ticket #996)

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */ /** deprecated */
public final static String ID = "Monotone"; public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION; public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 18; public final static long BUILD = 19;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = "-rc"; public final static String EXTRA = "-rc";