Skip to content

Throw original exception when command.close() throws Exception too #304

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

Closed
marcuslinke wants to merge 5 commits into from
Closed

Throw original exception when command.close() throws Exception too #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
93bff93
fix issue #303
Aug 21, 2015
1aa5deb
Use Closeable instead of AutoCloseable
Aug 21, 2015
1889302
Fomat source
Aug 21, 2015
b7e9732
fix issue #303
Aug 21, 2015
e7854e3
Merge branch 'issue-303' of https://github.com/docker-java/docker-jav…
Aug 23, 2015
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
3 changes: 3 additions & 0 deletions src/main/java/com/github/dockerjava/api/command/DockerCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,7 @@

public interface DockerCmd<RES_T> extends Closeable {

@Override
public void close();

}
2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/core/command/AbstrAsyncDockerCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public <T extends ResultCallback<A_RES_T>> T exec(T resultCallback) {
}

@Override
public void close() throws IOException {
public void close() {
}

}
2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public RES_T exec() throws DockerException {
}

@Override
public void close() throws IOException {
public void close() {
}

protected String registryAuth(AuthConfig authConfig) {
Expand Down
8 changes: 6 additions & 2 deletions src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,10 +197,14 @@ public BuildImageCmd withBuildAuthConfigs(AuthConfigurations authConfigs) {
}

@Override
public void close() throws IOException {
public void close() {
super.close();

tarInputStream.close();
try {
tarInputStream.close();
} catch (IOException e) {
throw new RuntimeException(e);
}
}

@Override
Expand Down
6 changes: 1 addition & 5 deletions src/main/java/com/github/dockerjava/jaxrs/AbstrAsyncDockerCmdExec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,7 @@ public void onError(Throwable throwable) {
@Override
public void onComplete() {
resultCallback.onComplete();
try {
command.close();
} catch (IOException e) {
throw new RuntimeException(e);
}
command.close();
}
};

Expand Down
24 changes: 8 additions & 16 deletions src/main/java/com/github/dockerjava/jaxrs/AbstrSyncDockerCmdExec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,17 @@ public AbstrSyncDockerCmdExec(WebTarget baseResource) {
@Override
public RES_T exec(CMD_T command) {
// this hack works because of ResponseStatusExceptionFilter
RES_T result;
try {
result = execute(command);

} catch (ProcessingException e) {
if (e.getCause() instanceof DockerException) {
throw (DockerException) e.getCause();
} else {
throw e;
}
} finally {
try (CMD_T cmd = command) {
try {
command.close();
} catch (IOException e) {
throw new RuntimeException(e);
return execute(cmd);
} catch (ProcessingException e) {
if (e.getCause() instanceof DockerException) {
throw (DockerException) e.getCause();
} else {
throw e;
}
}
}

return result;
}

protected abstract RES_T execute(CMD_T command);
Expand Down