Merge branch 'clientbuilder-fix' of https://github.com/camunda-ci/docker-java into camunda-ci-clientbuilder-fix

Marcus Linke · Marcus Linke · commit 5b0800d7ac8e · 2015-08-24T22:15:09.000+02:00
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java b/src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
@@ -16,12 +16,9 @@ public class DockerClientBuilder {
     static {
         serviceLoader.reload();
         Iterator<DockerCmdExecFactory> iterator = serviceLoader.iterator();
-        if (!iterator.hasNext()) {
-            throw new RuntimeException("Fatal: Can't find any implementation of '"
-                    + DockerCmdExecFactory.class.getName() + "' in the current classpath.");
+        if (iterator.hasNext()) {
+            factoryClass = iterator.next().getClass();
         }
-
-        factoryClass = iterator.next().getClass();
     }
 
     private DockerClientImpl dockerClient = null;
@@ -49,6 +46,11 @@ public static DockerClientBuilder getInstance(String serverUrl) {
     }
 
     public static DockerCmdExecFactory getDefaultDockerCmdExecFactory() {
+        if (factoryClass == null) {
+            throw new RuntimeException("Fatal: Can't find any implementation of '"
+                + DockerCmdExecFactory.class.getName() + "' in the current classpath.");
+        }
+
         try {
             return factoryClass.newInstance();
         } catch (InstantiationException | IllegalAccessException e) {
