arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-20 21:01:25 +03:00
Code Activity

Closing streams using IOUtils.closeQuietly

Browse Source 
Fixed badly handled stream found in the meanwhile
This commit is contained in:
Federico Fissore
2015-05-21 16:47:50 +02:00
parent a5ad02f818
commit 365b0bdc94
26 changed files with 112 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
arduino-core/src/processing/app/helpers/FileUtils.java
View File

@ -1,5 +1,7 @@
package processing.app.helpers;
import org.apache.commons.compress.utils.IOUtils;
import java.io.*;
import java.util.ArrayList;
import java.util.Arrays;
@ -49,12 +51,8 @@ public class FileUtils {
fos.write(buf, 0, readBytes);
}
} finally {
if (fis != null) {
fis.close();
}
if (fos != null) {
fos.close();
}
IOUtils.closeQuietly(fis);
IOUtils.closeQuietly(fos);
}
}
@ -185,13 +183,7 @@ public class FileUtils {
}
return sb.toString();
} finally {
if (reader != null) {
try {
reader.close();
} catch (IOException e) {
// noop
}
}
IOUtils.closeQuietly(reader);
}
}

10
arduino-core/src/processing/app/helpers/NetUtils.java
View File

@ -1,5 +1,7 @@
package processing.app.helpers;
import org.apache.commons.compress.utils.IOUtils;
import java.io.IOException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
@ -43,13 +45,7 @@ public abstract class NetUtils {
} catch (IOException e) {
return false;
} finally {
if (socket != null) {
try {
socket.close();
} catch (IOException e) {
// noop
}
}
IOUtils.closeQuietly(socket);
}
}
}

5
arduino-core/src/processing/app/helpers/PreferencesMap.java
View File

@ -21,6 +21,7 @@
*/
package processing.app.helpers;
import org.apache.commons.compress.utils.IOUtils;
import processing.app.legacy.PApplet;
import java.io.*;
@ -72,9 +73,7 @@ public class PreferencesMap extends LinkedHashMap<String, String> {
fileInputStream = new FileInputStream(file);
load(fileInputStream);
} finally {
if (fileInputStream != null) {
fileInputStream.close();
}
IOUtils.closeQuietly(fileInputStream);
}
}