OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-13 12:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Close stream on exception

Browse Source
This commit is contained in:
Steven Post authored and Steven Post committed 2013-10-28 11:11:46 +01:00
1 parent 4b023ebc54
commit f02bf90842
1 file changed
+34 -15
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/hudson/Main.java
+34 -15
View File
@@ -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);