Merge branch 'camunda-ci-resultCallback-NPE't push origin master

Marcus Linke · Marcus Linke · commit f007e19b4ef9 · 2015-08-24T22:13:32.000+02:00
diff --git a/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java b/src/main/java/com/github/dockerjava/core/GoLangFileMatch.java
@@ -24,16 +24,16 @@
  *                  character class (must be non-empty)
  *       c           matches character c (c != '*', '?', '\\', '[')
  *       '\\' c      matches character c
- *
+ * 
  *   character-range:
  *       c           matches character c (c != '\\', '-', ']')
  *       '\\' c      matches character c
  *       lo '-' hi   matches character c for lo <= c <= hi
- *
+ * 
  *  Match requires pattern to match all of name, not just a substring.
  *  The only possible returned error is ErrBadPattern, when pattern
  *  is malformed.
- *
+ * 
  * On Windows, escaping is disabled. Instead, '\\' is treated as
  *  path separator.
  * </pre>
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());
         }
     }
diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
@@ -206,8 +206,8 @@ private List<String> matchingIgnorePatterns(String fileName) {
         }
 
         /**
-         * Returns the matching ignore pattern for the given file or null if it should NOT be ignored.
-         * Exception rules like "!Dockerfile" will be respected.
+         * Returns the matching ignore pattern for the given file or null if it should NOT be ignored. Exception rules
+         * like "!Dockerfile" will be respected.
          */
         private String effectiveMatchingIgnorePattern(File file) {
             String relativeFilename = FilePathUtil.relativize(getDockerFolder(), file);
@@ -221,7 +221,8 @@ private String effectiveMatchingIgnorePattern(File file) {
 
             int lastMatchingPatternIndex = ignores.lastIndexOf(lastMatchingPattern);
 
-            if(lastMatchingPatternIndex == ignores.size() - 1) return lastMatchingPattern;
+            if (lastMatchingPatternIndex == ignores.size() - 1)
+                return lastMatchingPattern;
 
             List<String> remainingIgnorePattern = ignores.subList(lastMatchingPatternIndex + 1, ignores.size());
 

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`	`}`