From d84cd6549b4aacda136a9894f3b0f4fcf3f55ae1 Mon Sep 17 00:00:00 2001 From: Xephi59 Date: Mon, 29 Jun 2015 03:02:07 +0200 Subject: [PATCH] HashMaps need to be Concurrent --- .../java/fr/xephi/authme/cache/auth/PlayerCache.java | 6 +++--- .../java/fr/xephi/authme/cache/limbo/LimboCache.java | 11 +++++------ .../xephi/authme/listener/AuthMePlayerListener.java | 3 --- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/main/java/fr/xephi/authme/cache/auth/PlayerCache.java b/src/main/java/fr/xephi/authme/cache/auth/PlayerCache.java index 5908b5d9..a517c756 100644 --- a/src/main/java/fr/xephi/authme/cache/auth/PlayerCache.java +++ b/src/main/java/fr/xephi/authme/cache/auth/PlayerCache.java @@ -1,14 +1,14 @@ package fr.xephi.authme.cache.auth; -import java.util.HashMap; +import java.util.concurrent.ConcurrentHashMap; public class PlayerCache { private static PlayerCache singleton = null; - private HashMap cache; + private ConcurrentHashMap cache; private PlayerCache() { - cache = new HashMap(); + cache = new ConcurrentHashMap(); } public void addPlayer(PlayerAuth auth) { diff --git a/src/main/java/fr/xephi/authme/cache/limbo/LimboCache.java b/src/main/java/fr/xephi/authme/cache/limbo/LimboCache.java index 10631d49..c09c27b3 100644 --- a/src/main/java/fr/xephi/authme/cache/limbo/LimboCache.java +++ b/src/main/java/fr/xephi/authme/cache/limbo/LimboCache.java @@ -1,6 +1,6 @@ package fr.xephi.authme.cache.limbo; -import java.util.HashMap; +import java.util.concurrent.ConcurrentHashMap; import org.bukkit.Bukkit; import org.bukkit.GameMode; @@ -18,13 +18,13 @@ import fr.xephi.authme.settings.Settings; public class LimboCache { private static LimboCache singleton = null; - public HashMap cache; + public ConcurrentHashMap cache; private FileCache playerData; public AuthMe plugin; private LimboCache(AuthMe plugin) { this.plugin = plugin; - this.cache = new HashMap(); + this.cache = new ConcurrentHashMap(); this.playerData = new FileCache(plugin); } @@ -52,9 +52,8 @@ public class LimboCache { playerGroup = playerData.readCache(player).getGroup(); operator = playerData.readCache(player).getOperator(); flying = playerData.readCache(player).isFlying(); - } catch (Exception e) - { - ConsoleLogger.showError("Some error on reading cache of " + name); + } catch (Exception e) { + ConsoleLogger.showError("Some error on reading cache of " + name); } } else { StoreInventoryEvent event = new StoreInventoryEvent(player); diff --git a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java index 685659fd..a38d5d1f 100644 --- a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java +++ b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java @@ -43,7 +43,6 @@ import fr.xephi.authme.Utils; import fr.xephi.authme.api.API; import fr.xephi.authme.cache.auth.PlayerAuth; import fr.xephi.authme.cache.auth.PlayerCache; -import fr.xephi.authme.cache.backup.FileCache; import fr.xephi.authme.cache.limbo.LimboCache; import fr.xephi.authme.cache.limbo.LimboPlayer; import fr.xephi.authme.datasource.DataSource; @@ -60,14 +59,12 @@ public class AuthMePlayerListener implements Listener { private Messages m = Messages.getInstance(); public AuthMe plugin; private DataSource data; - private FileCache playerBackup; public static ConcurrentHashMap causeByAuthMe = new ConcurrentHashMap(); private List antibot = new ArrayList(); public AuthMePlayerListener(AuthMe plugin, DataSource data) { this.plugin = plugin; this.data = data; - this.playerBackup = new FileCache(plugin); } @EventHandler(priority = EventPriority.LOWEST)