Merge pull request docker-java#457 from mbaechler/issue-456

marcuslinke · marcuslinke · commit 44108488e1be · 2016-02-12T22:53:43.000+01:00
Issue-456 input configuration should not be altered as it breaks unix&hellip;
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
@@ -65,7 +65,7 @@ public class DockerClientConfig implements Serializable {
 
     private static final String DOCKER_IO_PROPERTIES_PROPERTY = "docker.io.properties";
 
-    private URI uri;
+    private final URI uri;
 
     private final String username, password, email, serverAddress, dockerCfgPath;
 
@@ -208,10 +208,6 @@ public URI getUri() {
         return uri;
     }
 
-    public void setUri(URI uri) {
-        this.uri = uri;
-    }
-
     public RemoteApiVersion getVersion() {
         return version;
     }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -153,9 +153,7 @@ public void init(DockerClientConfig dockerClientConfig) {
             protocol = "http";
         }
 
-        if(originalUri.getScheme().equals("unix")) {
-            dockerClientConfig.setUri(UnixConnectionSocketFactory.sanitizeUri(originalUri));
-        } else {
+        if(!originalUri.getScheme().equals("unix")) {
             configureProxy(clientConfig, protocol);
         }
 
@@ -181,9 +179,16 @@ public void init(DockerClientConfig dockerClientConfig) {
 
         client = clientBuilder.build();
 
-        baseResource = client.target(dockerClientConfig.getUri()).path(dockerClientConfig.getVersion().asWebPathPart());
+        baseResource = client.target(sanitizeUrl(dockerClientConfig.getUri())).path(dockerClientConfig.getVersion().asWebPathPart());
     }
 
+    private URI sanitizeUrl(URI originalUri) {
+        if (originalUri.getScheme().equals("unix")) {
+            return UnixConnectionSocketFactory.sanitizeUri(originalUri);
+        }
+        return originalUri;
+    }
+    
     private void configureProxy(ClientConfig clientConfig, String protocol) {
 
         List<Proxy> proxies = ProxySelector.getDefault().select(dockerClientConfig.getUri());

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public class DockerClientConfig implements Serializable {`
`65`	`65`
`66`	`66`	`private static final String DOCKER_IO_PROPERTIES_PROPERTY = "docker.io.properties";`
`67`	`67`
`68`		`- private URI uri;`
	`68`	`+ private final URI uri;`
`69`	`69`
`70`	`70`	`private final String username, password, email, serverAddress, dockerCfgPath;`
`71`	`71`
`@@ -208,10 +208,6 @@ public URI getUri() {`
`208`	`208`	`return uri;`
`209`	`209`	`}`
`210`	`210`
`211`		`- public void setUri(URI uri) {`
`212`		`- this.uri = uri;`
`213`		`- }`
`214`		`-`
`215`	`211`	`public RemoteApiVersion getVersion() {`
`216`	`212`	`return version;`
`217`	`213`	`}`