fixup

jenkinsci · Mar 20, 2018 · 1b7f3f0 · 1b7f3f0
1 parent 26ee3e2
commit 1b7f3f0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubectlBuildWrapper.java b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubectlBuildWrapper.java
@@ -127,9 +127,12 @@ public void setUp(Context context, Run<?, ?> build, FilePath workspace, Launcher
         if (c instanceof FileCredentials) {
             InputStream configStream = ((FileCredentials) c).getContent();
             BufferedReader reader = new BufferedReader(new InputStreamReader(configStream, StandardCharsets.UTF_8));
-            String kubeconfigContents = reader.lines().collect(Collectors.joining("\n"));
-            configFile.write(kubeconfigContents, null);
-            reader.close();
+            try {
+                String kubeconfigContents = reader.lines().collect(Collectors.joining("\n"));
+                configFile.write(kubeconfigContents, null);
+            } finally {
+                reader.close();
+            }
             return;
         }
 

diff --git a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesFactoryAdapter.java b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesFactoryAdapter.java
@@ -118,10 +118,13 @@ public KubernetesClient createClient() throws NoSuchAlgorithmException, Unrecove
         if (credentials instanceof FileCredentials) {
             InputStream configStream = ((FileCredentials) credentials).getContent();
             BufferedReader reader = new BufferedReader(new InputStreamReader(configStream, StandardCharsets.UTF_8));
-            String kubeconfigContents = reader.lines().collect(Collectors.joining("\n"));
-            Config config = Config.fromKubeconfig(kubeconfigContents);
-            builder = new ConfigBuilder(config);
-            reader.close();
+            try {
+                String kubeconfigContents = reader.lines().collect(Collectors.joining("\n"));
+                Config config = Config.fromKubeconfig(kubeconfigContents);
+                builder = new ConfigBuilder(config);
+            } finally {
+                reader.close();
+            }
         } else if (credentials instanceof StringCredentials) {
             final String token = ((StringCredentials) credentials).getSecret().getPlainText();
             builder.withOauthToken(token);