Skip to content

Commit 15eda1d

Browse files
authored
Merge pull request #17315 from wtlucy/http2_fat_secure_client_fix
http2_fat secure h2 client is not closing connections correctly
2 parents 12c208d + db99c85 commit 15eda1d

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

dev/com.ibm.ws.transport.http2_fat/fat/src/com/ibm/ws/http2/client/SecureHttp2Client.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2020 IBM Corporation and others.
2+
* Copyright (c) 2020, 2021 IBM Corporation and others.
33
* All rights reserved. This program and the accompanying materials
44
* are made available under the terms of the Eclipse Public License v1.0
55
* which accompanies this distribution, and is available at
@@ -52,6 +52,7 @@
5252
import org.apache.hc.core5.http2.impl.nio.H2StreamListener;
5353
import org.apache.hc.core5.http2.impl.nio.bootstrap.H2RequesterBootstrap;
5454
import org.apache.hc.core5.http2.ssl.H2ClientTlsStrategy;
55+
import org.apache.hc.core5.io.CloseMode;
5556
import org.apache.hc.core5.net.NamedEndpoint;
5657
import org.apache.hc.core5.reactor.ssl.SSLSessionVerifier;
5758
import org.apache.hc.core5.reactor.ssl.TlsDetails;
@@ -114,8 +115,7 @@ public List<String> makeSecureRequests(String host, int port, String[] requestUr
114115
latch.await(29, TimeUnit.SECONDS);
115116

116117
LOGGER.logp(Level.INFO, CLASS_NAME, "drivePushRequests", "requests complete, shutting down client");
117-
requester.initiateShutdown();
118-
requester.awaitShutdown(TimeValue.ofSeconds(10));
118+
requester.close(CloseMode.GRACEFUL);
119119
logResponseMessages(responseMessages);
120120
LOGGER.logp(Level.INFO, CLASS_NAME, "drivePushRequests", "client shutdown complete, returning");
121121
return responseMessages;

0 commit comments

Comments
 (0)