Update src/main/java/org/jenkinsci/plugins/docker/commons/impl/RegistryKeyMaterialFactory.java

arthurvanduynhoven · oleg-nenashev · web-flow · commit 5ba1316be722 · 2020-01-06T14:18:53.000+01:00
Co-Authored-By: Oleg Nenashev &lt;o.v.nenashev@gmail.com&gt;
diff --git a/src/main/java/org/jenkinsci/plugins/docker/commons/impl/RegistryKeyMaterialFactory.java b/src/main/java/org/jenkinsci/plugins/docker/commons/impl/RegistryKeyMaterialFactory.java
@@ -93,7 +93,7 @@ public KeyMaterial materialize() throws IOException, InterruptedException {
             // Need to get tmp dir - get base dir length and increase by 1 to include the path separator
             String existingTmpConfigDir = existingDockerSecretConfigPath.substring(baseDir.getRemote().length() + 1);
             FilePath existingDockerConfigPath = baseDir.child(existingTmpConfigDir).child(DOCKER_CONFIG_FILENAME);
-            dockerConfig = UpdateDockerConfigFromSource(dockerConfig, existingDockerConfigPath, BLACKLISTED_NESTED_PROPERTIES);
+            dockerConfig = updateDockerConfigFromSource(dockerConfig, existingDockerConfigPath, BLACKLISTED_NESTED_PROPERTIES);
         }
 
         try {

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public KeyMaterial materialize() throws IOException, InterruptedException {`
`93`	`93`	`// Need to get tmp dir - get base dir length and increase by 1 to include the path separator`
`94`	`94`	`String existingTmpConfigDir = existingDockerSecretConfigPath.substring(baseDir.getRemote().length() + 1);`
`95`	`95`	`FilePath existingDockerConfigPath = baseDir.child(existingTmpConfigDir).child(DOCKER_CONFIG_FILENAME);`
`96`		`- dockerConfig = UpdateDockerConfigFromSource(dockerConfig, existingDockerConfigPath, BLACKLISTED_NESTED_PROPERTIES);`
	`96`	`+ dockerConfig = updateDockerConfigFromSource(dockerConfig, existingDockerConfigPath, BLACKLISTED_NESTED_PROPERTIES);`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`try {`