Upstream/BlueMap
1
0
Fork 0
mirror of https://github.com/BlueMap-Minecraft/BlueMap.git synced 2024-11-29 05:55:57 +01:00
Code Issues Projects Releases Wiki Activity

Fix syncronization issue with the marker-api

Browse Source
This commit is contained in:
Blue (Lukas Rieger) 2021-06-17 22:56:29 +02:00
parent c31945444d
commit 470a5cbad1
No known key found for this signature in database
GPG Key ID: 904C4995F9E1F800
1 changed files with 47 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/api/marker/MarkerAPIImpl.java
View File

@ -92,6 +92,7 @@ public synchronized void load() throws IOException {
} }
private synchronized void load(boolean overwriteChanges) throws IOException { private synchronized void load(boolean overwriteChanges) throws IOException {
synchronized (MarkerAPIImpl.class) {
Set<String> externallyRemovedSets = new HashSet<>(markerSets.keySet()); Set<String> externallyRemovedSets = new HashSet<>(markerSets.keySet());
if (markerFile.exists() && markerFile.isFile()) { if (markerFile.exists() && markerFile.isFile()) {
@ -132,9 +133,11 @@ private synchronized void load(boolean overwriteChanges) throws IOException {
removedMarkerSets.clear(); removedMarkerSets.clear();
} }
} }
}
@Override @Override
public synchronized void save() throws IOException { public synchronized void save() throws IOException {
synchronized (MarkerAPIImpl.class) {
load(false); load(false);
FileUtils.createFile(markerFile); FileUtils.createFile(markerFile);
@ -150,5 +153,6 @@ public synchronized void save() throws IOException {
removedMarkerSets.clear(); removedMarkerSets.clear();
} }
}
} }