sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Avoid FD leaking in binary importer/exporter

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10768 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
sha..RD 2013-09-13 00:29:59 +00:00
parent d6a1b63206
commit f94bc8660c
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engine/src/core-plugins/com/jme3/export/binary/BinaryExporter.java
View File

@ -327,14 +327,18 @@ public class BinaryExporter implements JmeExporter {
public boolean save(Savable object, File f) throws IOException {
File parentDirectory = f.getParentFile();
if(parentDirectory != null && !parentDirectory.exists()) {
if (parentDirectory != null && !parentDirectory.exists()) {
parentDirectory.mkdirs();
}
FileOutputStream fos = new FileOutputStream(f);
boolean rVal = save(object, fos);
fos.close();
return rVal;
try {
return save(object, fos);
} finally {
if (fos != null) {
fos.close();
}
}
}
public BinaryOutputCapsule getCapsule(Savable object) {

10
engine/src/core-plugins/com/jme3/export/binary/BinaryImporter.java
View File

@ -267,9 +267,13 @@ public final class BinaryImporter implements JmeImporter {
public Savable load(File f, ReadListener listener) throws IOException {
FileInputStream fis = new FileInputStream(f);
Savable rVal = load(fis, listener);
fis.close();
return rVal;
try {
return load(fis, listener);
} finally {
if (fis != null) {
fis.close();
}
}
}
public Savable load(byte[] data) throws IOException {