Added logic in MakeHttpRequestStage to check and abort request if interrupted

Author: joviegas

core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MakeHttpRequestStage.java

@@ -75,9 +75,11 @@ private HttpExecuteResponse executeHttpRequest(SdkHttpFullRequest request, Reque
         context.apiCallAttemptTimeoutTracker().abortable(requestCallable);
 
         Pair<HttpExecuteResponse, Duration> measuredExecute = MetricUtils.measureDurationUnsafe(requestCallable);
-
         attemptMetricCollector.reportMetric(CoreMetric.SERVICE_CALL_DURATION, measuredExecute.right());
-
+        if (Thread.currentThread().isInterrupted()) {
+            requestCallable.abort();
+            InterruptMonitor.checkInterrupted();
+        }
         return measuredExecute.left();
     }
 

http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/ApacheHttpClient.java

@@ -24,7 +24,6 @@
 import static software.amazon.awssdk.utils.NumericUtils.saturatedCast;
 
 import java.io.IOException;
-import java.io.InterruptedIOException;
 import java.net.InetAddress;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
@@ -230,10 +229,6 @@ public ExecutableHttpRequest prepareRequest(HttpExecuteRequest request) {
             @Override
             public HttpExecuteResponse call() throws IOException {
                 HttpExecuteResponse executeResponse = execute(apacheRequest, metricCollector);
-                if (Thread.interrupted()) {
-                    abort();
-                    throw new InterruptedIOException(Thread.currentThread().getName() + " was interrupted");
-                }
                 collectPoolMetric(metricCollector);
                 return executeResponse;
             }