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

* Avoid FD leaking in AbstractHeightMap save

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

14
engine/src/terrain/com/jme3/terrain/heightmap/AbstractHeightMap.java
View File

@ -253,9 +253,12 @@ public abstract class AbstractHeightMap implements HeightMap {
throw new Exception("Filename must not be null"); throw new Exception("Filename must not be null");
} }
//open the streams and send the height data to the file. //open the streams and send the height data to the file.
FileOutputStream fos = null;
DataOutputStream dos = null;
try { try {
FileOutputStream fos = new FileOutputStream(filename); fos = new FileOutputStream(filename);
DataOutputStream dos = new DataOutputStream(fos); dos = new DataOutputStream(fos);
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
for (int j = 0; j < size; j++) { for (int j = 0; j < size; j++) {
dos.write((int) heightData[j + (i * size)]); dos.write((int) heightData[j + (i * size)]);
@ -270,6 +273,13 @@ public abstract class AbstractHeightMap implements HeightMap {
} catch (IOException e) { } catch (IOException e) {
logger.log(Level.WARNING, "Error writing to file {0}", filename); logger.log(Level.WARNING, "Error writing to file {0}", filename);
return false; return false;
} finally {
if (fos != null) {
fos.close();
}
if (dos != null) {
dos.close();
}
} }
logger.log(Level.FINE, "Saved terrain to {0}", filename); logger.log(Level.FINE, "Saved terrain to {0}", filename);