docker-java
diff --git a/‎src/main/java/com/github/dockerjava/core/DockerConfigFile.java‎
Lines changed: 2 additions & 4 deletions b/‎src/main/java/com/github/dockerjava/core/DockerConfigFile.java‎
Lines changed: 2 additions & 4 deletions
@@ -50,7 +50,7 @@ void addAuthConfig(AuthConfig config) {
     }
 
     @CheckForNull
-    public AuthConfig resolveAuthConfig(@Nonnull String hostname) {
+    public AuthConfig resolveAuthConfig(@CheckForNull String hostname) {
         if (StringUtils.isEmpty(hostname) || AuthConfig.DEFAULT_SERVER_ADDRESS.equals(hostname)) {
             return auths.get(AuthConfig.DEFAULT_SERVER_ADDRESS);
         }
@@ -124,10 +124,8 @@ public static DockerConfigFile loadConfig(@CheckForNull String dockerConfigPath)
             return new DockerConfigFile();
         }
 
-        DockerConfigFile dockerConfig;
-
         //parse new docker config file format
-        dockerConfig = loadCurrentConfig(dockerConfigPath);
+        DockerConfigFile dockerConfig = loadCurrentConfig(dockerConfigPath);
 
         //parse old auth config file format
         if (dockerConfig == null) {
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ void addAuthConfig(AuthConfig config) {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`@CheckForNull`
`53`		`- public AuthConfig resolveAuthConfig(@Nonnull String hostname) {`
	`53`	`+ public AuthConfig resolveAuthConfig(@CheckForNull String hostname) {`
`54`	`54`	`if (StringUtils.isEmpty(hostname) \|\| AuthConfig.DEFAULT_SERVER_ADDRESS.equals(hostname)) {`
`55`	`55`	`return auths.get(AuthConfig.DEFAULT_SERVER_ADDRESS);`
`56`	`56`	`}`
`@@ -124,10 +124,8 @@ public static DockerConfigFile loadConfig(@CheckForNull String dockerConfigPath)`
`124`	`124`	`return new DockerConfigFile();`
`125`	`125`	`}`
`126`	`126`
`127`		`- DockerConfigFile dockerConfig;`
`128`		`-`
`129`	`127`	`//parse new docker config file format`
`130`		`- dockerConfig = loadCurrentConfig(dockerConfigPath);`
	`128`	`+ DockerConfigFile dockerConfig = loadCurrentConfig(dockerConfigPath);`
`131`	`129`
`132`	`130`	`//parse old auth config file format`
`133`	`131`	`if (dockerConfig == null) {`