Skip to content

fix(core): fix NPE if latestItem is null in result callback #306

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
marcuslinke merged 1 commit into from
Aug 24, 2015
Merged

fix(core): fix NPE if latestItem is null in result callback #306

Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,9 @@ public String awaitImageId(long timeout, TimeUnit timeUnit) {
}

private String getImageId() {
if (latestItem == null || !latestItem.isBuildSuccessIndicated()) {
if (latestItem == null) {
throw new DockerClientException("Could not build image");
} else if (!latestItem.isBuildSuccessIndicated()) {
throw new DockerClientException("Could not build image: " + latestItem.getError());
} else {
return latestItem.getImageId();
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ public void awaitSuccess() {
throw new DockerClientException("", e);
}

if (latestItem == null || !latestItem.isPullSuccessIndicated()) {
if (latestItem == null) {
throw new DockerClientException("Could not pull image");
} else if (!latestItem.isPullSuccessIndicated()) {
throw new DockerClientException("Could not pull image: " + latestItem.getError());
}
}
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ public void awaitSuccess() {
throw new DockerClientException("", e);
}

if (latestItem == null || latestItem.isErrorIndicated()) {
if (latestItem == null) {
throw new DockerClientException("Could not push image");
} else if (latestItem.isErrorIndicated()) {
throw new DockerClientException("Could not push image: " + latestItem.getError());
}
}
Expand Down