Skip to content

Fix potential NPE in ApiCallAttemptTimeoutTrackingStage #6332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 18, 2025
Merged

Fix potential NPE in ApiCallAttemptTimeoutTrackingStage #6332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e8adfa2
fix potential NullPointerException in ApiCallAttemptTimeoutTrackingSt…
L-Applin Aug 12, 2025
19336d6
changelog
L-Applin Aug 12, 2025
ca4f635
updated changelog description
L-Applin Aug 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changes/next-release/bugfix-AWSSDKforJavav2-71c9a16.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"type": "bugfix",
"category": "AWS SDK for Java v2",
"contributor": "",
"description": "Fix a potential NullPointerException that may be thrown when API call timeout is configured"
}
6 changes: 4 additions & 2 deletions .../amazon/awssdk/core/internal/http/pipeline/stages/ApiCallAttemptTimeoutTrackingStage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,8 @@ private Exception translatePipelineException(RequestExecutionContext context, Ex
// but before we called timeoutTracker.cancel(). Note that if hasExecuted() returns true, its guaranteed that
// the timeout tracker has set the interrupt flag, and if it returns false, it guarantees that it did not and
// will never set the interrupt flag.
if (context.apiCallAttemptTimeoutTracker().hasExecuted()) {
TimeoutTracker timeoutTracker = context.apiCallAttemptTimeoutTracker();
if (timeoutTracker != null && timeoutTracker.hasExecuted()) {
// Clear the interrupt flag. Since we already have an exception from the call, which may contain information
// that's useful to the caller, just return that instead of an ApiCallTimeoutException.
Thread.interrupted();
Expand All @@ -136,7 +137,8 @@ private RuntimeException handleInterruptedException(RequestExecutionContext cont
"Failed to close the response stream",
r::close));
}
if (context.apiCallAttemptTimeoutTracker().hasExecuted()) {
TimeoutTracker timeoutTracker = context.apiCallAttemptTimeoutTracker();
if (timeoutTracker != null && timeoutTracker.hasExecuted()) {
// Clear the interrupt status
Thread.interrupted();
return generateApiCallAttemptTimeoutException(context);
Expand Down
Loading