projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-17 07:02:54 -04:00
Code Issues Projects Releases Wiki Activity

Merged in cdmpse/holocore/error_on_first_load (pull request #94)

Browse Source 
Prevent concurrent modification error when cfg files need to be generated
This commit is contained in:
Obique PSWG
2015-10-28 22:06:01 -05:00
parent c8948265d2 53a451c468
commit 796eecc63c
1 changed files with 53 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/server_info/ConfigData.java
+53 -42
View File
@@ -55,15 +55,21 @@ class ConfigData {
}
public boolean containsKey(String key) {
return data.containsKey(key);
synchronized (data) {
return data.containsKey(key);
}
}
public String get(String key) {
return data.get(key);
synchronized (data) {
return data.get(key);
}
}
public String put(String key, String value) {
return data.put(key, value);
synchronized (data) {
return data.put(key, value);
}
}
/**
@@ -74,54 +80,57 @@ class ConfigData {
Map<String, String> delta = new HashMap<>();
BufferedReader reader = null;
delta.putAll(data); // Copy the current data
try {
reader = new BufferedReader(new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8));
String line = reader.readLine();
while (line != null) {
loadLine(line);
line = reader.readLine();
}
} catch (IOException e) {
e.printStackTrace();
return null;
} finally {
if (reader != null) {
try {
reader.close();
} catch (IOException e) {
return null;
synchronized (data) {
delta.putAll(data); // Copy the current data
try {
reader = new BufferedReader(new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8));
String line = reader.readLine();
while (line != null) {
loadLine(line);
line = reader.readLine();
}
} catch (IOException e) {
e.printStackTrace();
return null;
} finally {
if (reader != null) {
try {
reader.close();
} catch (IOException e) {
return null;
}
}
}
for(Entry<String, String> entry : data.entrySet())
delta.remove(entry.getKey(), entry.getValue());
}
for(Entry<String, String> entry : data.entrySet())
delta.remove(entry.getKey(), entry.getValue());
return delta;
}
public boolean save() {
BufferedWriter writer = null;
try {
writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8));
writer.write("# "+FORMAT.format(System.currentTimeMillis()));
writer.newLine();
for (Entry <String, String> e : data.entrySet()) {
writer.write(e.getKey() + "=" + e.getValue());
synchronized (data) {
try {
writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8));
writer.write("# "+FORMAT.format(System.currentTimeMillis()));
writer.newLine();
}
return true;
} catch (IOException e) {
e.printStackTrace();
return false;
} finally {
if (writer != null) {
try {
writer.close();
} catch (IOException e) {
for (Entry <String, String> e : data.entrySet()) {
writer.write(e.getKey() + "=" + e.getValue());
writer.newLine();
}
return true;
} catch (IOException e) {
e.printStackTrace();
return false;
} finally {
if (writer != null) {
try {
writer.close();
} catch (IOException e) {
}
}
}
}
@@ -135,7 +144,9 @@ class ConfigData {
return;
String key = beforeComment.substring(0, beforeComment.indexOf('='));
String val = beforeComment.substring(key.length()+1);
data.put(key, val);
synchronized (data) {
data.put(key, val);
}
}
}