Sulkta-OSS/dynmap-neoforge
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tighten up file closing on exceptions

Browse source
This commit is contained in:
Mike Primm 2011-10-19 12:20:56 +08:00 • committed by mikeprimm
parent 5c064eab2b
commit d70ea37b31
3 changed files with 59 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/main/java/org/dynmap/regions/FactionsConfigHandler.java
View file

@ -47,14 +47,21 @@ public class FactionsConfigHandler {
return rslt;
}
JSONObject fact = null;
Reader inputFileReader = null;
try {
Reader inputFileReader = new InputStreamReader(new FileInputStream(faction), cs_utf8);
inputFileReader = new InputStreamReader(new FileInputStream(faction), cs_utf8);
fact = (JSONObject) parser.parse(inputFileReader);
inputFileReader.close();
} catch (IOException ex) {
Log.severe("Exception while reading factions.json.", ex);
} catch (ParseException ex) {
Log.severe("Exception while parsing factions.json.", ex);
} finally {
if(inputFileReader != null) {
try {
inputFileReader.close();
} catch (IOException iox) {}
inputFileReader = null;
}
}
if(fact == null)
return rslt;
@ -66,13 +73,19 @@ public class FactionsConfigHandler {
}
JSONObject blocks = null;
try {
Reader inputFileReader = new InputStreamReader(new FileInputStream(board), cs_utf8);
inputFileReader = new InputStreamReader(new FileInputStream(board), cs_utf8);
blocks = (JSONObject) parser.parse(inputFileReader);
inputFileReader.close();
} catch (IOException ex) {
Log.severe("Exception while reading board.json.", ex);
} catch (ParseException ex) {
Log.severe("Exception while parsing board.json.", ex);
} finally {
if(inputFileReader != null) {
try {
inputFileReader.close();
} catch (IOException iox) {}
inputFileReader = null;
}
}
if(blocks == null)
return rslt;

11
src/main/java/org/dynmap/regions/RegionsComponent.java
View file

@ -157,14 +157,21 @@ public class RegionsComponent extends ClientComponent {
else {
outputFile = new File(plugin.getDataFolder(), webWorldPath.toString());
}
FileOutputStream fos = null;
try {
FileOutputStream fos = new FileOutputStream(outputFile);
fos = new FileOutputStream(outputFile);
fos.write(Json.stringifyJson(regionData).getBytes());
fos.close();
} catch (FileNotFoundException ex) {
Log.severe("Exception while writing JSON-file.", ex);
} catch (IOException ioe) {
Log.severe("Exception while writing JSON-file.", ioe);
} finally {
if(fos != null) {
try {
fos.close();
} catch (IOException iox) {}
fos = null;
}
}
}