Skip to content

Commit 575d494

Browse files
committed
Pass initiator and reason to connection::close
1 parent 81e66b4 commit 575d494

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

src/io/calimero/knxnetip/StreamConnection.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,12 +212,16 @@ private enum SessionState { Idle, Unauthenticated, Authenticated }
212212

213213
@Override
214214
public void close() {
215+
close(CloseEvent.USER_REQUEST, "user request");
216+
}
217+
218+
void close(final int initiator, final String reason) {
215219
if (sessionState == SessionState.Idle)
216220
return;
217221

218222
sessionState = SessionState.Idle;
219223
keepAliveFuture.cancel(false);
220-
securedConnections.values().forEach(ClientConnection::close);
224+
securedConnections.values().forEach(c -> c.close(initiator, reason, Level.DEBUG, null));
221225
securedConnections.clear();
222226
conn.sessions.remove(sessionId);
223227

@@ -647,7 +651,7 @@ void close(final int initiator, final String reason) {
647651
unsecuredConnections.values().forEach(t -> t.close(initiator, reason, Level.DEBUG, null));
648652
unsecuredConnections.clear();
649653

650-
sessions.values().forEach(SecureSession::close);
654+
sessions.values().forEach(s -> s.close(initiator, reason));
651655
sessions.clear();
652656
}
653657

0 commit comments

Comments
 (0)