diff options
author | snowleo <schneeleo@gmail.com> | 2012-09-10 19:06:17 +0200 |
---|---|---|
committer | snowleo <schneeleo@gmail.com> | 2012-09-10 19:06:17 +0200 |
commit | ff18374456ffeaa6d60ec974fb2645c733d3e1ba (patch) | |
tree | 47f1e1d936e222b313fa184abaf7bb831fe4f7d6 /EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds | |
parent | b4460f8bac00e764b9ad6b9972d22a3da227f0a6 (diff) | |
download | Essentials-ff18374456ffeaa6d60ec974fb2645c733d3e1ba.tar Essentials-ff18374456ffeaa6d60ec974fb2645c733d3e1ba.tar.gz Essentials-ff18374456ffeaa6d60ec974fb2645c733d3e1ba.tar.lz Essentials-ff18374456ffeaa6d60ec974fb2645c733d3e1ba.tar.xz Essentials-ff18374456ffeaa6d60ec974fb2645c733d3e1ba.zip |
Revert bad synchronization
This reverts commit 9d820c94a6ff82ee4fef33d0b4e4389282d03d7e.
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds')
-rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java index 123070759..f84262eeb 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java @@ -11,7 +11,6 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; -import java.util.Hashtable; import java.util.List; import java.util.Map; import java.util.Properties; @@ -34,7 +33,7 @@ public class WorldsHolder { /** * Map with instances of loaded worlds. */ - private Hashtable<String, OverloadedWorldHolder> worldsData = new Hashtable<String, OverloadedWorldHolder>(); + private Map<String, OverloadedWorldHolder> worldsData = new HashMap<String, OverloadedWorldHolder>(); /** * Map of mirrors: <nonExistingWorldName, existingAndLoadedWorldName> @@ -62,7 +61,7 @@ public class WorldsHolder { public void resetWorldsHolder() { - worldsData = new Hashtable<String, OverloadedWorldHolder>(); + worldsData = new HashMap<String, OverloadedWorldHolder>(); mirrorsGroup = new HashMap<String, String>(); mirrorsUser = new HashMap<String, String>(); @@ -403,10 +402,8 @@ public class WorldsHolder { if (worldsData.containsKey(worldNameLowered)) { OverloadedWorldHolder data = worldsData.get(worldNameLowered); - synchronized (data) { - data.updateDataSource(); - return data; - } + data.updateDataSource(); + return data; } return null; |