Invoke Thread.currentThread().interrupt() in a InterruptedException b…

…lock.
grpc · Sep 18, 2024 · c1375bb · ejona86 · Sep 18, 2024 · c1375bb
1 parent ef53441
commit c1375bb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/s2a/src/main/java/io/grpc/s2a/channel/S2AHandshakerServiceChannel.java b/s2a/src/main/java/io/grpc/s2a/channel/S2AHandshakerServiceChannel.java
@@ -170,6 +170,7 @@ public void close() {
         isDelegateTerminated =
             delegate.awaitTermination(DELEGATE_TERMINATION_TIMEOUT.getSeconds(), SECONDS);
       } catch (InterruptedException e) {
+        Thread.currentThread().interrupt();
         isDelegateTerminated = false;
       }
       long quietPeriodSeconds = isDelegateTerminated ? 0 : 1;

diff --git a/s2a/src/main/java/io/grpc/s2a/handshaker/S2ATrustManager.java b/s2a/src/main/java/io/grpc/s2a/handshaker/S2ATrustManager.java
@@ -121,6 +121,7 @@ private void checkPeerTrusted(X509Certificate[] chain, boolean isCheckingClientC
     try {
       resp = stub.send(reqBuilder.build());
     } catch (IOException | InterruptedException e) {
+      Thread.currentThread().interrupt();
       throw new CertificateException("Failed to send request to S2A.", e);
     }
     if (resp.hasStatus() && resp.getStatus().getCode() != 0) {