mirror of
https://github.com/TotalFreedomMC/TF-EssentialsX.git
synced 2024-07-14 08:16:05 +00:00
Prevent reading and writing the usermap at the same time.
This commit is contained in:
parent
ed9e4ecd28
commit
8e7abe325e
|
@ -45,6 +45,16 @@ public class UUIDMap
|
||||||
userList.createNewFile();
|
userList.createNewFile();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
synchronized (pendingDiskWrites)
|
||||||
|
{
|
||||||
|
if (ess.getSettings().isDebug())
|
||||||
|
{
|
||||||
|
ess.getLogger().log(Level.INFO, "Reading usermap from disk");
|
||||||
|
}
|
||||||
|
|
||||||
|
names.clear();
|
||||||
|
history.clear();
|
||||||
|
|
||||||
final BufferedReader reader = new BufferedReader(new FileReader(userList));
|
final BufferedReader reader = new BufferedReader(new FileReader(userList));
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
@ -86,6 +96,7 @@ public class UUIDMap
|
||||||
reader.close();
|
reader.close();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
catch (IOException ex)
|
catch (IOException ex)
|
||||||
{
|
{
|
||||||
Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
|
Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
|
||||||
|
@ -99,6 +110,10 @@ public class UUIDMap
|
||||||
|
|
||||||
public void forceWriteUUIDMap()
|
public void forceWriteUUIDMap()
|
||||||
{
|
{
|
||||||
|
if (ess.getSettings().isDebug())
|
||||||
|
{
|
||||||
|
ess.getLogger().log(Level.INFO, "Forcing usermap write to disk");
|
||||||
|
}
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
Future<?> future = _writeUUIDMap();;
|
Future<?> future = _writeUUIDMap();;
|
||||||
|
@ -119,7 +134,7 @@ public class UUIDMap
|
||||||
|
|
||||||
public Future<?> _writeUUIDMap()
|
public Future<?> _writeUUIDMap()
|
||||||
{
|
{
|
||||||
final ConcurrentSkipListMap<String, UUID> names = ess.getUserMap().getNames().clone();
|
final ConcurrentSkipListMap<String, UUID> names = ess.getUserMap().getNames();
|
||||||
if (names.size() < 1)
|
if (names.size() < 1)
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
|
|
|
@ -51,7 +51,6 @@ public class UserMap extends CacheLoader<UUID, User> implements IConf
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
keys.clear();
|
keys.clear();
|
||||||
names.clear();
|
|
||||||
users.invalidateAll();
|
users.invalidateAll();
|
||||||
for (String string : userdir.list())
|
for (String string : userdir.list())
|
||||||
{
|
{
|
||||||
|
@ -200,7 +199,7 @@ public class UserMap extends CacheLoader<UUID, User> implements IConf
|
||||||
|
|
||||||
public Set<UUID> getAllUniqueUsers()
|
public Set<UUID> getAllUniqueUsers()
|
||||||
{
|
{
|
||||||
return Collections.unmodifiableSet(keys);
|
return Collections.unmodifiableSet(keys.clone());
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getUniqueUsers()
|
public int getUniqueUsers()
|
||||||
|
@ -208,12 +207,12 @@ public class UserMap extends CacheLoader<UUID, User> implements IConf
|
||||||
return keys.size();
|
return keys.size();
|
||||||
}
|
}
|
||||||
|
|
||||||
public ConcurrentSkipListMap<String, UUID> getNames()
|
protected ConcurrentSkipListMap<String, UUID> getNames()
|
||||||
{
|
{
|
||||||
return names;
|
return names;
|
||||||
}
|
}
|
||||||
|
|
||||||
public ConcurrentSkipListMap<UUID, ArrayList<String>> getHistory()
|
protected ConcurrentSkipListMap<UUID, ArrayList<String>> getHistory()
|
||||||
{
|
{
|
||||||
return history;
|
return history;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue