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

menski · menski · commit 69221fe9bc12 · 2015-08-23T09:45:13.000+02:00
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java b/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java
@@ -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();
diff --git a/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java b/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
@@ -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());
         }
     }
diff --git a/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java b/src/main/java/com/github/dockerjava/core/command/PushImageResultCallback.java
@@ -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());
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,9 @@ public void awaitSuccess() {`
`40`	`40`	`throw new DockerClientException("", e);`
`41`	`41`	`}`
`42`	`42`
`43`		`- if (latestItem == null \|\| !latestItem.isPullSuccessIndicated()) {`
	`43`	`+ if (latestItem == null) {`
	`44`	`+ throw new DockerClientException("Could not pull image");`
	`45`	`+ } else if (!latestItem.isPullSuccessIndicated()) {`
`44`	`46`	`throw new DockerClientException("Could not pull image: " + latestItem.getError());`
`45`	`47`	`}`
`46`	`48`	`}`