TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-04-27 17:09:43 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '2.x' of https://github.com/drtshock/Essentials into 2.x

Browse source
This commit is contained in:
vemacs 2015-12-01 17:33:20 -07:00
commit 569c848764
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Essentials/src/com/earth2me/essentials/UUIDMap.java
View file

@ -5,6 +5,7 @@ import org.bukkit.Bukkit;
import java.io.*; import java.io.*;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.*; import java.util.concurrent.*;
@ -95,10 +96,15 @@ public class UUIDMap {
} }
public Future<?> _writeUUIDMap() { public Future<?> _writeUUIDMap() {
final ConcurrentSkipListMap<String, UUID> names = ess.getUserMap().getNames(); Map<String, UUID> names = ess.getUserMap().getNames();
if (names.size() < 1) { if (names.size() < 1) {
return null; return null;
} }
// The _names_ Map is being shallowly cloned because of an issue that occurs during restarts/reloads that
// causes UserMap database to be cleared. The assumed culprit is names.clear() when loading in UserMap.
//
// For more information, please refer to #213.
names = new HashMap<>(names);
pendingDiskWrites.incrementAndGet(); pendingDiskWrites.incrementAndGet();
Future<?> future = EXECUTOR_SERVICE.submit(new WriteRunner(ess.getDataFolder(), userList, names, pendingDiskWrites)); Future<?> future = EXECUTOR_SERVICE.submit(new WriteRunner(ess.getDataFolder(), userList, names, pendingDiskWrites));
return future; return future;
@ -108,10 +114,10 @@ public class UUIDMap {
private static class WriteRunner implements Runnable { private static class WriteRunner implements Runnable {
private final File location; private final File location;
private final File endFile; private final File endFile;
private final ConcurrentSkipListMap<String, UUID> names; private final Map<String, UUID> names;
private final AtomicInteger pendingDiskWrites; private final AtomicInteger pendingDiskWrites;
private WriteRunner(final File location, final File endFile, final ConcurrentSkipListMap<String, UUID> names, final AtomicInteger pendingDiskWrites) { private WriteRunner(final File location, final File endFile, final Map<String, UUID> names, final AtomicInteger pendingDiskWrites) {
this.location = location; this.location = location;
this.endFile = endFile; this.endFile = endFile;
this.names = names; this.names = names;