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 | 736a6d273abb000c81b17d0142ce358d2225f873 (patch) | |
tree | 1c27aa1f8656f13903415da23e6cf857acd1f4d4 /EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java | |
parent | 71179e3dfd4ed8668fd4096d15326613c4a05750 (diff) | |
download | Essentials-736a6d273abb000c81b17d0142ce358d2225f873.tar Essentials-736a6d273abb000c81b17d0142ce358d2225f873.tar.gz Essentials-736a6d273abb000c81b17d0142ce358d2225f873.tar.lz Essentials-736a6d273abb000c81b17d0142ce358d2225f873.tar.xz Essentials-736a6d273abb000c81b17d0142ce358d2225f873.zip |
Revert bad synchronization
This reverts commit 96ab1b4533b62464b8325373e677209290bced3e.
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java')
-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; |