Skip to content

Commit c1375bb

Browse files
committed
Invoke Thread.currentThread().interrupt() in a InterruptedException block.
1 parent ef53441 commit c1375bb

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

s2a/src/main/java/io/grpc/s2a/channel/S2AHandshakerServiceChannel.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ public void close() {
170170
isDelegateTerminated =
171171
delegate.awaitTermination(DELEGATE_TERMINATION_TIMEOUT.getSeconds(), SECONDS);
172172
} catch (InterruptedException e) {
173+
Thread.currentThread().interrupt();
173174
isDelegateTerminated = false;
174175
}
175176
long quietPeriodSeconds = isDelegateTerminated ? 0 : 1;

s2a/src/main/java/io/grpc/s2a/handshaker/S2ATrustManager.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ private void checkPeerTrusted(X509Certificate[] chain, boolean isCheckingClientC
121121
try {
122122
resp = stub.send(reqBuilder.build());
123123
} catch (IOException | InterruptedException e) {
124+
Thread.currentThread().interrupt();
124125
throw new CertificateException("Failed to send request to S2A.", e);
125126
}
126127
if (resp.hasStatus() && resp.getStatus().getCode() != 0) {

0 commit comments

Comments
 (0)