Merge branch 'JENKINS-22641' of github.com:christ66/jenkins into JENK…

…INS-22641
jenkinsci · Jul 21, 2014 · 9ac68b9 · 9ac68b9
2 parents 0d4c0cb + 10466fe
commit 9ac68b9
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/core/src/main/java/hudson/util/ProcessTree.java b/core/src/main/java/hudson/util/ProcessTree.java
@@ -711,12 +711,10 @@ public synchronized EnvVars getEnvironmentVariables() {
         }
 
         public byte[] readFileToByteArray(File file) throws IOException {
-            InputStream in = null;
+            InputStream in = org.apache.commons.io.FileUtils.openInputStream(file);
             try {
-                in = org.apache.commons.io.FileUtils.openInputStream(file);
                 return org.apache.commons.io.IOUtils.toByteArray(in);
             } finally {
-                if (in != null)
                     in.close();
             }
         }