Merge remote-tracking branch 'origin/groupmanager' into 2.9

1 files changed, 6 insertions, 5 deletions

diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Variables.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Variables.java
index 42ceba7e4..8e1a54b98 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Variables.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Variables.java
@@ -4,9 +4,9 @@
  */
 package org.anjocaido.groupmanager.data;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * A class that holds variables of a user/group.
@@ -21,7 +21,7 @@ import java.util.Set;
 public abstract class Variables implements Cloneable {
 
 	private DataUnit owner;
-	protected Map<String, Object> variables = new HashMap<String, Object>();
+	protected final Map<String, Object> variables = Collections.synchronizedMap(new HashMap<String, Object>());
 
 	public Variables(DataUnit owner) {
 
@@ -126,9 +126,10 @@ public abstract class Variables implements Cloneable {
 	 * 
 	 * @return Set of all variable names.
 	 */
-	public Set<String> getVarKeyList() {
-
-		return variables.keySet();
+	public String[] getVarKeyList() {
+		synchronized(variables) {
+			return variables.keySet().toArray(new String[0]);
+		}
 	}
 
 	/**