I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

prevent race NPE http://forum.i2p/viewtopic.php?t=3066

Browse Source
This commit is contained in:
zzz
2009-02-06 21:19:45 +00:00
parent e7bccb2f47
commit 06e1305df2
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/src/net/i2p/data/i2cp/I2CPMessageReader.java
View File

@ -134,9 +134,11 @@ public class I2CPMessageReader {
public void cancelRunner() { public void cancelRunner() {
_doRun = false; _doRun = false;
_stayAlive = false; _stayAlive = false;
if (_stream != null) { // prevent race NPE
InputStream in = _stream;
if (in != null) {
try { try {
_stream.close(); in.close();
} catch (IOException ioe) { } catch (IOException ioe) {
_log.error("Error closing the stream", ioe); _log.error("Error closing the stream", ioe);
} }
@ -164,6 +166,7 @@ public class I2CPMessageReader {
_listener.disconnected(I2CPMessageReader.this); _listener.disconnected(I2CPMessageReader.this);
cancelRunner(); cancelRunner();
} catch (OutOfMemoryError oom) { } catch (OutOfMemoryError oom) {
// ooms seen here... maybe log and keep going?
throw oom; throw oom;
} catch (Exception e) { } catch (Exception e) {
_log.log(Log.CRIT, "Unhandled error reading I2CP stream", e); _log.log(Log.CRIT, "Unhandled error reading I2CP stream", e);