From 63f082b424d74d58c6c96e84133e5181fb52cdbe Mon Sep 17 00:00:00 2001
From: Peter Miller <peter@mineplex.com>
Date: Tue, 10 Jun 2014 16:09:33 -0400
Subject: [PATCH] Implementing suggested code style/locking changes and
 recommitting (JIRA-76)

---
 .../core/simpleStats/SimpleStats.java         | 32 +++++++++++--------
 .../simpleStats/SimpleStatsRepository.java    |  3 --
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/Plugins/Mineplex.Core/src/mineplex/core/simpleStats/SimpleStats.java b/Plugins/Mineplex.Core/src/mineplex/core/simpleStats/SimpleStats.java
index f944d20f4..fd1719fad 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/simpleStats/SimpleStats.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/simpleStats/SimpleStats.java
@@ -23,8 +23,12 @@ public class SimpleStats extends MiniPlugin
 		_repository.initialize();
 	}
 
-	public NautHashMap<String, String> get_entries() {
-		return _entries;
+	public NautHashMap<String, String> getEntries()
+	{
+		synchronized (_transferLock)
+		{
+			return _entries;
+		}
 	}
 	
 	@EventHandler
@@ -33,16 +37,16 @@ public class SimpleStats extends MiniPlugin
 		if (updateEvent.getType() != UpdateType.SLOW)
 			return;
 		
-		synchronized (_transferLock)
+		Bukkit.getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable()
 		{
-			Bukkit.getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable()
-			{
-				public void run()
-				{					
+			public void run()
+			{	
+				synchronized (_transferLock)
+				{
 					_entries = (_repository.retrieveStatRecords());
 				}
-			});
-		}
+			}
+		});
 	}
 	
 	public void store(String statName, String statValue)
@@ -50,15 +54,15 @@ public class SimpleStats extends MiniPlugin
 		final String statNameFinal = statName;
 		final String statValueFinal = statValue;		
 		
-		synchronized (_transferLock)
+		Bukkit.getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable()
 		{
-			Bukkit.getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable()
+			public void run()
 			{
-				public void run()
+				synchronized (_transferLock)
 				{
 					_repository.storeStatValue(statNameFinal, statValueFinal);
 				}
-			});
-		}
+			}
+		});
 	}
 }
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/simpleStats/SimpleStatsRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/simpleStats/SimpleStatsRepository.java
index 2d83f67d8..9040c014c 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/simpleStats/SimpleStatsRepository.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/simpleStats/SimpleStatsRepository.java
@@ -8,9 +8,6 @@ import java.sql.SQLException;
 
 import mineplex.core.common.util.NautHashMap;
 
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
 public class SimpleStatsRepository 
 {
 	private static Object _connectionLock = new Object();