Fix issue #396

Marcus Linke · Marcus Linke · commit b9f32db8d341 · 2015-12-15T20:49:10.000+01:00
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -140,16 +140,23 @@ public void init(DockerClientConfig dockerClientConfig) {
         URI originalUri = dockerClientConfig.getUri();
 
         SSLContext sslContext = null;
+        String protocol = null;
 
         if (dockerClientConfig.getSslConfig() != null) {
-            configureProxy(clientConfig, "https");
+            protocol = "https";
             try {
                 sslContext = dockerClientConfig.getSslConfig().getSSLContext();
             } catch (Exception ex) {
                 throw new DockerClientException("Error in SSL Configuration", ex);
             }
         } else {
-            configureProxy(clientConfig, "http");
+            protocol = "http";
+        }
+
+        if(originalUri.getScheme().equals("unix")) {
+            dockerClientConfig.setUri(UnixConnectionSocketFactory.sanitizeUri(originalUri));
+        } else {
+            configureProxy(clientConfig, protocol);
         }
 
         PoolingHttpClientConnectionManager connManager = new PoolingHttpClientConnectionManager(getSchemeRegistry(
@@ -174,12 +181,7 @@ public void init(DockerClientConfig dockerClientConfig) {
 
         client = clientBuilder.build();
 
-        if (originalUri.getScheme().equals("unix")) {
-            dockerClientConfig.setUri(UnixConnectionSocketFactory.sanitizeUri(originalUri));
-        }
-
         baseResource = client.target(dockerClientConfig.getUri()).path(dockerClientConfig.getVersion().asWebPathPart());
-
     }
 
     private void configureProxy(ClientConfig clientConfig, String protocol) {
