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

37
src/main/java/org/dynmap/JsonFileClientUpdateComponent.java
View file

@ -93,10 +93,12 @@ public class JsonFileClientUpdateComponent extends ClientUpdateComponent {
int retrycnt = 0;
boolean done = false;
while(!done) {
FileOutputStream fos = null;
try {
FileOutputStream fos = new FileOutputStream(outputTempFile);
fos = new FileOutputStream(outputTempFile);
fos.write(clientConfiguration.toJSONString().getBytes("UTF-8"));
fos.close();
fos = null;
outputFile.delete();
outputTempFile.renameTo(outputFile);
done = true;
@ -109,6 +111,14 @@ public class JsonFileClientUpdateComponent extends ClientUpdateComponent {
Log.severe("Exception while writing JSON-configuration-file.", ioe);
done = true;
}
} finally {
if(fos != null) {
try {
fos.close();
} catch (IOException iox) {
}
fos = null;
}
}
}
}
@ -132,10 +142,12 @@ public class JsonFileClientUpdateComponent extends ClientUpdateComponent {
int retrycnt = 0;
boolean done = false;
while(!done) {
FileOutputStream fos = null;
try {
FileOutputStream fos = new FileOutputStream(outputTempFile);
fos = new FileOutputStream(outputTempFile);
fos.write(Json.stringifyJson(update).getBytes("UTF-8"));
fos.close();
fos = null;
outputFile.delete();
outputTempFile.renameTo(outputFile);
done = true;
@ -148,6 +160,14 @@ public class JsonFileClientUpdateComponent extends ClientUpdateComponent {
Log.severe("Exception while writing JSON-file.", ioe);
done = true;
}
} finally {
if(fos != null) {
try {
fos.close();
} catch (IOException iox) {
}
fos = null;
}
}
}
plugin.events.<ClientUpdateEvent>trigger("clientupdatewritten", clientUpdate);
@ -160,14 +180,23 @@ public class JsonFileClientUpdateComponent extends ClientUpdateComponent {
File webchatFile = getStandaloneFile("dynmap_webchat.json");
if (webchatFile.exists() && lastTimestamp != 0) {
JSONArray jsonMsgs = null;
Reader inputFileReader = null;
try {
Reader inputFileReader = new InputStreamReader(new FileInputStream(webchatFile), cs_utf8);
inputFileReader = new InputStreamReader(new FileInputStream(webchatFile), cs_utf8);
jsonMsgs = (JSONArray) parser.parse(inputFileReader);
inputFileReader.close();
} catch (IOException ex) {
Log.severe("Exception while reading JSON-file.", ex);
} catch (ParseException ex) {
Log.severe("Exception while parsing JSON-file.", ex);
} finally {
if(inputFileReader != null) {
try {
inputFileReader.close();
} catch (IOException iox) {
}
inputFileReader = null;
}
}
if (jsonMsgs != null) {