Skip to content

auto close in ResultCallback#awaitCompletion #1415

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
bsideup merged 1 commit into from
Jun 16, 2020
Merged

auto close in ResultCallback#awaitCompletion #1415

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 23 additions & 7 deletions docker-java-api/src/main/java/com/github/dockerjava/api/async/ResultCallbackTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,18 @@ public void close() throws IOException {
*/
@SuppressWarnings("unchecked")
public RC_T awaitCompletion() throws InterruptedException {
completed.await();
// eventually (re)throws RuntimeException
throwFirstError();
return (RC_T) this;
try {
completed.await();
// eventually (re)throws RuntimeException
throwFirstError();
return (RC_T) this;
} finally {
try {
close();
} catch (IOException e) {
LOGGER.debug("Failed to close", e);
}
}
}

/**
Expand All @@ -99,9 +107,17 @@ public RC_T awaitCompletion() throws InterruptedException {
* before {@link ResultCallback#onComplete()} was called.
*/
public boolean awaitCompletion(long timeout, TimeUnit timeUnit) throws InterruptedException {
boolean result = completed.await(timeout, timeUnit);
throwFirstError();
return result;
try {
boolean result = completed.await(timeout, timeUnit);
throwFirstError();
return result;
} finally {
try {
close();
} catch (IOException e) {
LOGGER.debug("Failed to close", e);
}
}
}

/**
Expand Down