goldcollection
/
muwire
mirror of https://github.com/zlatinb/muwire
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

close() output streams on rejection, update test

pull/24/head
Zlatin Balevsky 2019-11-05 12:57:52 +00:00
parent a9aad7d9db
commit 7e881f1fe6
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/groovy/com/muwire/core/connection/ConnectionAcceptor.groovy
View File

@ -159,6 +159,7 @@ class ConnectionAcceptor {
} }
} catch (Exception ex) { } catch (Exception ex) {
log.log(Level.WARNING, "incoming connection failed",ex) log.log(Level.WARNING, "incoming connection failed",ex)
e.getOutputStream().close()
e.close() e.close()
eventBus.publish new ConnectionEvent(endpoint: e, incoming: true, leaf: null, status: ConnectionAttemptStatus.FAILED) eventBus.publish new ConnectionEvent(endpoint: e, incoming: true, leaf: null, status: ConnectionAttemptStatus.FAILED)
} }
@ -207,7 +208,7 @@ class ConnectionAcceptor {
os.writeShort(json.bytes.length) os.writeShort(json.bytes.length)
os.write(json.bytes) os.write(json.bytes)
} }
e.outputStream.flush() e.outputStream.close()
e.close() e.close()
eventBus.publish(new ConnectionEvent(endpoint: e, incoming: true, leaf: leaf, status: ConnectionAttemptStatus.REJECTED)) eventBus.publish(new ConnectionEvent(endpoint: e, incoming: true, leaf: leaf, status: ConnectionAttemptStatus.REJECTED))
} }

2
core/src/test/groovy/com/muwire/core/connection/ConnectionAcceptorTest.groovy
View File

@ -95,7 +95,7 @@ class ConnectionAcceptorTest {
connectionEstablisher = connectionEstablisherMock.proxyInstance() connectionEstablisher = connectionEstablisherMock.proxyInstance()
acceptor = new ConnectionAcceptor(eventBus, connectionManager, settings, i2pAcceptor, acceptor = new ConnectionAcceptor(eventBus, connectionManager, settings, i2pAcceptor,
hostCache, trustService, searchManager, uploadManager, null, connectionEstablisher) hostCache, trustService, searchManager, uploadManager, null, connectionEstablisher, null)
acceptor.start() acceptor.start()
Thread.sleep(100) Thread.sleep(100)
} }