From b060a4929d9d172ec287d28f50d750b502ddc8f5 Mon Sep 17 00:00:00 2001
From: Riya Mehta <riyamehta@google.com>
Date: Wed, 18 Sep 2024 17:14:19 -0700
Subject: [PATCH] only interrupt on InterruptedException.

---
 s2a/src/main/java/io/grpc/s2a/handshaker/S2ATrustManager.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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