From f02bf908424a72e62ac4cd37fe1b37104854ae70 Mon Sep 17 00:00:00 2001
From: Steven Post <steven.post@archimiddle.com>
Date: Mon, 18 Mar 2013 15:22:15 +0100
Subject: [PATCH] Close stream on exception

---
 core/src/main/java/hudson/Main.java | 49 ++++++++++++++++++++---------
 1 file changed, 34 insertions(+), 15 deletions(-)

diff --git a/core/src/main/java/hudson/Main.java b/core/src/main/java/hudson/Main.java
index 45067f932b..a3dc3b00cb 100644
--- a/core/src/main/java/hudson/Main.java
+++ b/core/src/main/java/hudson/Main.java
@@ -138,23 +138,33 @@ public class Main {
             FileOutputStream os = new FileOutputStream(tmpFile);
 
             Writer w = new OutputStreamWriter(os,"UTF-8");
-            w.write("<?xml version='1.0' encoding='UTF-8'?>");
-            w.write("<run><log encoding='hexBinary' content-encoding='"+Charset.defaultCharset().name()+"'>");
-            w.flush();
+            int ret;
+            try {
+                w.write("<?xml version='1.0' encoding='UTF-8'?>");
+                w.write("<run><log encoding='hexBinary' content-encoding='"+Charset.defaultCharset().name()+"'>");
+                w.flush();
 
-            // run the command
-            long start = System.currentTimeMillis();
+                // run the command
+                long start = System.currentTimeMillis();
 
-            List<String> cmd = new ArrayList<String>();
-            for( int i=1; i<args.length; i++ )
-                cmd.add(args[i]);
-            Proc proc = new Proc.LocalProc(cmd.toArray(new String[0]),(String[])null,System.in,
-                new DualOutputStream(System.out,new EncodingStream(os)));
+                List<String> cmd = new ArrayList<String>();
+                for( int i=1; i<args.length; i++ )
+                    cmd.add(args[i]);
+                Proc proc = new Proc.LocalProc(cmd.toArray(new String[0]),(String[])null,System.in,
+                    new DualOutputStream(System.out,new EncodingStream(os)));
 
-            int ret = proc.join();
+                ret = proc.join();
 
-            w.write("</log><result>"+ret+"</result><duration>"+(System.currentTimeMillis()-start)+"</duration></run>");
-            w.close();
+                w.write("</log><result>"+ret+"</result><duration>"+(System.currentTimeMillis()-start)+"</duration></run>");
+            }
+            finally {
+                try {
+                    w.close();
+                }
+                catch (IOException ioe) {
+                    // swallow exception
+                }
+            }
 
             String location = home+"job/"+projectNameEnc+"/postBuildResult";
             while(true) {
@@ -171,8 +181,17 @@ public class Main {
                     con.connect();
                     // send the data
                     FileInputStream in = new FileInputStream(tmpFile);
-                    Util.copyStream(in,con.getOutputStream());
-                    in.close();
+                    try {
+                        Util.copyStream(in,con.getOutputStream());
+                    }
+                    finally {
+                        try {
+                            in.close();
+                        }
+                        catch (IOException ioe) {
+                            // swallow exception
+                        }
+                    }
 
                     if(con.getResponseCode()!=200) {
                         Util.copyStream(con.getErrorStream(),System.err);