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

I2CP: Don't call listener.readError() after external client disconnect via destroySocketManager()

Browse Source 
prevents log error on normal client shutdown
reported and tested by zlatinb
This commit is contained in:
zzz
2021-09-10 13:43:26 -04:00
parent 2d239edf34
commit 3917dc6d2f
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -190,10 +190,14 @@ public class I2CPMessageReader {
_listener.readError(I2CPMessageReader.this, ime);
cancelRunner();
} catch (IOException ioe) {
_log.warn("IO Error handling message", ioe);
_listener.readError(I2CPMessageReader.this, ioe);
if (_stayAlive) {
_log.warn("IO Error handling message", ioe);
_listener.readError(I2CPMessageReader.this, ioe);
} // else triggered by cancelRunner(), ignore SocketException
_listener.disconnected(I2CPMessageReader.this);
cancelRunner();
if (_stayAlive) {
cancelRunner();
}
} catch (OutOfMemoryError oom) {
// ooms seen here... maybe log and keep going?
throw oom;