OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-04 07:35:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

rely on try-with-resources

Browse Source
This commit is contained in:
Nicolas De Loof authored and Nicolas De loof committed 2016-10-03 15:12:48 +02:00
1 parent 2acecf5d7a
commit 7b39424495
40 files changed
+196 -400
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/src/main/java/hudson/FilePath.java
+26 -67
View File
@@ -389,11 +389,8 @@ public final class FilePath implements Serializable {
}
public void zip(FilePath dst) throws IOException, InterruptedException {
OutputStream os = dst.write();
try {
try (OutputStream os = dst.write()) {
zip(os);
} finally {
os.close();
}
}
@@ -594,11 +591,8 @@ public final class FilePath implements Serializable {
if (p != null) {
mkdirs(p);
}
InputStream input = zip.getInputStream(e);
try {
try (InputStream input = zip.getInputStream(e)) {
IOUtils.copy(input, writing(f));
} finally {
input.close();
}
try {
FilePath target = new FilePath(f);
@@ -868,8 +862,7 @@ public final class FilePath implements Serializable {
this.archive = archive;
}
@Override public Void invoke(File dir, VirtualChannel channel) throws IOException, InterruptedException {
InputStream in = archive.openStream();
try {
try (InputStream in = archive.openStream()) {
CountingInputStream cis = new CountingInputStream(in);
try {
if (archive.toExternalForm().endsWith(".zip")) {
@@ -880,8 +873,6 @@ public final class FilePath implements Serializable {
} catch (IOException x) {
throw new IOException(String.format("Failed to unpack %s (%d bytes read)", archive, cis.getByteCount()), x);
}
} finally {
in.close();
}
return null;
}
@@ -894,11 +885,8 @@ public final class FilePath implements Serializable {
* @since 1.293
*/
public void copyFrom(URL url) throws IOException, InterruptedException {
InputStream in = url.openStream();
try {
try (InputStream in = url.openStream()) {
copyFrom(in);
} finally {
in.close();
}
}
@@ -908,11 +896,8 @@ public final class FilePath implements Serializable {
* @since 1.293
*/
public void copyFrom(InputStream in) throws IOException, InterruptedException {
OutputStream os = write();
try {
try (OutputStream os = write()) {
org.apache.commons.io.IOUtils.copy(in, os);
} finally {
os.close();
}
}
@@ -938,16 +923,9 @@ public final class FilePath implements Serializable {
throw new IOException(e);
}
} else {
InputStream i = file.getInputStream();
OutputStream o = write();
try {
try (InputStream i = file.getInputStream();
OutputStream o = write()) {
org.apache.commons.io.IOUtils.copy(i,o);
} finally {
try {
o.close();
} finally {
i.close();
}
}
}
}
@@ -1396,11 +1374,8 @@ public final class FilePath implements Serializable {
throw new IOException("Failed to create a temporary directory in "+dir,e);
}
Writer w = new FileWriter(writing(f));
try {
try (Writer w = new FileWriter(writing(f))) {
w.write(contents);
} finally {
w.close();
}
return f.getAbsolutePath();
@@ -1877,11 +1852,8 @@ public final class FilePath implements Serializable {
* Reads this file into a string, by using the current system encoding.
*/
public String readToString() throws IOException, InterruptedException {
InputStream in = read();
try {
try (InputStream in = read()) {
return org.apache.commons.io.IOUtils.toString(in);
} finally {
in.close();
}
}
@@ -1931,11 +1903,8 @@ public final class FilePath implements Serializable {
public Void invoke(File f, VirtualChannel channel) throws IOException {
mkdirs(f.getParentFile());
FileOutputStream fos = new FileOutputStream(writing(f));
Writer w = encoding != null ? new OutputStreamWriter(fos, encoding) : new OutputStreamWriter(fos);
try {
try (Writer w = encoding != null ? new OutputStreamWriter(fos, encoding) : new OutputStreamWriter(fos)) {
w.write(content);
} finally {
w.close();
}
return null;
}
@@ -2008,11 +1977,8 @@ public final class FilePath implements Serializable {
*/
public void copyTo(FilePath target) throws IOException, InterruptedException {
try {
OutputStream out = target.write();
try {
try (OutputStream out = target.write()) {
copyTo(out);
} finally {
out.close();
}
} catch (IOException e) {
throw new IOException("Failed to copy "+this+" to "+target,e);
@@ -2198,11 +2164,9 @@ public final class FilePath implements Serializable {
Future<Void> future = target.actAsync(new SecureFileCallable<Void>() {
private static final long serialVersionUID = 1L;
public Void invoke(File f, VirtualChannel channel) throws IOException {
try {
readFromTar(remote + '/' + description, f,TarCompression.GZIP.extract(pipe.getIn()));
try (InputStream in = pipe.getIn()) {
readFromTar(remote + '/' + description, f,TarCompression.GZIP.extract(in));
return null;
} finally {
pipe.getIn().close();
}
}
});
@@ -2226,10 +2190,8 @@ public final class FilePath implements Serializable {
Future<Integer> future = actAsync(new SecureFileCallable<Integer>() {
private static final long serialVersionUID = 1L;
public Integer invoke(File f, VirtualChannel channel) throws IOException {
try {
return writeToTar(f, scanner, TarCompression.GZIP.compress(pipe.getOut()));
} finally {
pipe.getOut().close();
try (OutputStream out = pipe.getOut()) {
return writeToTar(f, scanner, TarCompression.GZIP.compress(out));
}
}
});
@@ -2298,14 +2260,13 @@ public final class FilePath implements Serializable {
* @since TODO supports large files > 10 GB, migration to commons-compress
*/
private void readFromTar(String name, File baseDir, InputStream in) throws IOException {
TarArchiveInputStream t = new TarArchiveInputStream(in);
// TarInputStream t = new TarInputStream(in);
try {
try (TarArchiveInputStream t = new TarArchiveInputStream(in)) {
TarArchiveEntry te;
while ((te = t.getNextTarEntry()) != null) {
File f = new File(baseDir,te.getName());
if(te.isDirectory()) {
File f = new File(baseDir, te.getName());
if (te.isDirectory()) {
mkdirs(f);
} else {
File parent = f.getParentFile();
@@ -2315,22 +2276,20 @@ public final class FilePath implements Serializable {
if (te.isSymbolicLink()) {
new FilePath(f).symlinkTo(te.getLinkName(), TaskListener.NULL);
} else {
IOUtils.copy(t,f);
IOUtils.copy(t, f);
f.setLastModified(te.getModTime().getTime());
int mode = te.getMode()&0777;
if(mode!=0 && !Functions.isWindows()) // be defensive
_chmod(f,mode);
int mode = te.getMode() & 0777;
if (mode != 0 && !Functions.isWindows()) // be defensive
_chmod(f, mode);
}
}
}
} catch(IOException e) {
throw new IOException("Failed to extract "+name,e);
} catch (IOException e) {
throw new IOException("Failed to extract " + name, e);
} catch (InterruptedException e) {
Thread.currentThread().interrupt(); // process this later
throw new IOException("Failed to extract "+name,e);
} finally {
t.close();
throw new IOException("Failed to extract " + name, e);
}
}