From 69221fe9bc12d35d95f0d3fdd5b7224c53f352fc Mon Sep 17 00:00:00 2001 From: Sebastian Menski Date: Sun, 23 Aug 2015 09:45:13 +0200 Subject: [PATCH] fix(core): fix NPE if latestItem is null in result callback --- .../dockerjava/core/command/BuildImageResultCallback.java | 4 +++- .../dockerjava/core/command/PullImageResultCallback.java | 4 +++- .../dockerjava/core/command/PushImageResultCallback.java | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java b/src/main/java/com/github/dockerjava/core/command/BuildImageResultCallback.java index 4de6e280e..ae36a63d7 100644 --- 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 index 18c33f885..1924759bd 100644 --- 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 index afcd16389..2b80a244e 100644 --- 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()); } }