From 7e881f1fe6d9447a913060f201e7a9cd2dae1006 Mon Sep 17 00:00:00 2001 From: Zlatin Balevsky Date: Tue, 5 Nov 2019 12:57:52 +0000 Subject: [PATCH] close() output streams on rejection, update test --- .../com/muwire/core/connection/ConnectionAcceptor.groovy | 3 ++- .../com/muwire/core/connection/ConnectionAcceptorTest.groovy | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/main/groovy/com/muwire/core/connection/ConnectionAcceptor.groovy b/core/src/main/groovy/com/muwire/core/connection/ConnectionAcceptor.groovy index 7b19a98d..d1df2abe 100644 --- a/core/src/main/groovy/com/muwire/core/connection/ConnectionAcceptor.groovy +++ b/core/src/main/groovy/com/muwire/core/connection/ConnectionAcceptor.groovy @@ -159,6 +159,7 @@ class ConnectionAcceptor { } } catch (Exception ex) { log.log(Level.WARNING, "incoming connection failed",ex) + e.getOutputStream().close() e.close() 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.write(json.bytes) } - e.outputStream.flush() + e.outputStream.close() e.close() eventBus.publish(new ConnectionEvent(endpoint: e, incoming: true, leaf: leaf, status: ConnectionAttemptStatus.REJECTED)) } diff --git a/core/src/test/groovy/com/muwire/core/connection/ConnectionAcceptorTest.groovy b/core/src/test/groovy/com/muwire/core/connection/ConnectionAcceptorTest.groovy index 6cd4589e..fc052f2b 100644 --- a/core/src/test/groovy/com/muwire/core/connection/ConnectionAcceptorTest.groovy +++ b/core/src/test/groovy/com/muwire/core/connection/ConnectionAcceptorTest.groovy @@ -95,7 +95,7 @@ class ConnectionAcceptorTest { connectionEstablisher = connectionEstablisherMock.proxyInstance() acceptor = new ConnectionAcceptor(eventBus, connectionManager, settings, i2pAcceptor, - hostCache, trustService, searchManager, uploadManager, null, connectionEstablisher) + hostCache, trustService, searchManager, uploadManager, null, connectionEstablisher, null) acceptor.start() Thread.sleep(100) }