From 1cf0ebbd7f120c0b8d421cc459f2d5a1386d82dc Mon Sep 17 00:00:00 2001
From: snowleo <schneeleo@gmail.com>
Date: Mon, 10 Sep 2012 20:49:07 +0200
Subject: Thread safety for GM

---
 .../src/org/anjocaido/groupmanager/data/Variables.java         | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Variables.java')

diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Variables.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Variables.java
index 42ceba7e4..10d8be469 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Variables.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Variables.java
@@ -4,6 +4,7 @@
  */
 package org.anjocaido.groupmanager.data;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
@@ -21,7 +22,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 +127,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]);
+		}
 	}
 
 	/**
-- 
cgit v1.2.3


From 75f7b06a23e8bed40d30068542b97959663c75e8 Mon Sep 17 00:00:00 2001
From: ElgarL <ElgarL@palmergames.com>
Date: Tue, 11 Sep 2012 11:12:19 +0100
Subject: Remove unused imports.

---
 .../src/org/anjocaido/groupmanager/data/Variables.java                   | 1 -
 1 file changed, 1 deletion(-)

(limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Variables.java')

diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Variables.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Variables.java
index 10d8be469..8e1a54b98 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Variables.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Variables.java
@@ -7,7 +7,6 @@ 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.
-- 
cgit v1.2.3