minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-15 19:14:18 +02:00
Code Issues Releases Wiki Activity

Prevent reading and writing the usermap at the same time.

Browse Source
This commit is contained in:
KHobbits
2014-05-17 01:50:41 +01:00
parent ed9e4ecd28
commit 8e7abe325e
2 changed files with 46 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Essentials/src/com/earth2me/essentials/UUIDMap.java
View File

@@ -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;

7
Essentials/src/com/earth2me/essentials/UserMap.java
View File

@@ -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;
} }