Merge pull request aws#847 from mblasi/jdk-lt-1.7

Null safe check for allowing excetion follow up
bseazeng · Sep 16, 2016 · 6201d29 · 6201d29
2 parents 5baae32 + e92e4be
commit 6201d29
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/aws-java-sdk-core/src/main/java/com/amazonaws/http/AmazonHttpClient.java b/aws-java-sdk-core/src/main/java/com/amazonaws/http/AmazonHttpClient.java
@@ -447,7 +447,9 @@ public <T> Response<T> executeWithTimer(Request<?> request,
                     clientExecutionTimer.startTimer(getClientExecutionTimeout(request.getOriginalRequest())));
             return doExecute(request, responseHandler, errorResponseHandler, executionContext);
         } finally {
-            executionContext.getClientExecutionTrackerTask().cancelTask();
+            if (executionContext.getClientExecutionTrackerTask() != null) {
+                executionContext.getClientExecutionTrackerTask().cancelTask();
+            }
         }
     }