8318492: Http2ClientImpl should attempt to close and remove connection in stop()
Reviewed-by: dfuchs, jpai
This commit is contained in:
parent
5411ad2a5c
commit
576c9bccfb
@ -228,11 +228,11 @@ class Http2ClientImpl {
|
|||||||
connectionPoolLock.unlock();
|
connectionPoolLock.unlock();
|
||||||
}
|
}
|
||||||
do {
|
do {
|
||||||
connections.values().forEach(this::close);
|
connections.values().removeIf(this::close);
|
||||||
} while (!connections.isEmpty());
|
} while (!connections.isEmpty());
|
||||||
}
|
}
|
||||||
|
|
||||||
private void close(Http2Connection h2c) {
|
private boolean close(Http2Connection h2c) {
|
||||||
// close all streams
|
// close all streams
|
||||||
try { h2c.closeAllStreams(); } catch (Throwable t) {}
|
try { h2c.closeAllStreams(); } catch (Throwable t) {}
|
||||||
// send GOAWAY
|
// send GOAWAY
|
||||||
@ -241,6 +241,8 @@ class Http2ClientImpl {
|
|||||||
try { h2c.shutdown(STOPPED); } catch (Throwable t) {}
|
try { h2c.shutdown(STOPPED); } catch (Throwable t) {}
|
||||||
// double check and close any new streams
|
// double check and close any new streams
|
||||||
try { h2c.closeAllStreams(); } catch (Throwable t) {}
|
try { h2c.closeAllStreams(); } catch (Throwable t) {}
|
||||||
|
// Allows for use of removeIf in stop()
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
HttpClientImpl client() {
|
HttpClientImpl client() {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user