rely on try-with-resources

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

No files matched your search

+6 -15
View File
@@ -198,14 +198,11 @@ public class Util {
StringBuilder str = new StringBuilder((int)logfile.length());
BufferedReader r = new BufferedReader(new InputStreamReader(new FileInputStream(logfile),charset));
try {
try (BufferedReader r = new BufferedReader(new InputStreamReader(new FileInputStream(logfile), charset))) {
char[] buf = new char[1024];
int len;
while((len=r.read(buf,0,buf.length))>0)
str.append(buf,0,len);
} finally {
r.close();
while ((len = r.read(buf, 0, buf.length)) > 0)
str.append(buf, 0, len);
}
return str.toString();
@@ -768,12 +765,9 @@ public class Util {
MessageDigest md5 = MessageDigest.getInstance("MD5");
byte[] buffer = new byte[1024];
DigestInputStream in =new DigestInputStream(source,md5);
try {
while(in.read(buffer)>=0)
try (DigestInputStream in = new DigestInputStream(source, md5)) {
while (in.read(buffer) >= 0)
; // simply discard the input
} finally {
in.close();
}
return toHexString(md5.digest());
} catch (NoSuchAlgorithmException e) {
@@ -806,11 +800,8 @@ public class Util {
*/
@Nonnull
public static String getDigestOf(@Nonnull File file) throws IOException {
InputStream is = new FileInputStream(file);
try {
try (InputStream is = new FileInputStream(file)) {
return getDigestOf(new BufferedInputStream(is));
} finally {
is.close();
}
}