From 413f485e0c5ee824827798c1eb59abe28910028d Mon Sep 17 00:00:00 2001
From: Olof Larsson <olof@sylt.nu>
Date: Fri, 15 May 2015 12:23:05 +0200
Subject: [PATCH] A few minor tweaks to the MassiveStore database accessor
 system.

---
 .../massivecraft/massivecore/store/accessor/Accessor.java | 8 ++++----
 .../massivecore/store/accessor/FieldAccessor.java         | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/com/massivecraft/massivecore/store/accessor/Accessor.java b/src/com/massivecraft/massivecore/store/accessor/Accessor.java
index 5d4d5fb5..3a41481f 100644
--- a/src/com/massivecraft/massivecore/store/accessor/Accessor.java
+++ b/src/com/massivecraft/massivecore/store/accessor/Accessor.java
@@ -21,7 +21,7 @@ public class Accessor
 	public Class<?> getClazz() { return this.clazz; }
 		
 	private Map<String, FieldAccessor> fieldToAccessor = new LinkedHashMap<String, FieldAccessor>();
-	public Map<String, FieldAccessor> getFieldToAccessor() {	return this.fieldToAccessor; }
+	public Map<String, FieldAccessor> getFieldToAccessor() { return this.fieldToAccessor; }
 	
 	public FieldAccessor getFieldAccessor(String fieldName)
 	{
@@ -50,14 +50,15 @@ public class Accessor
 	{
 		Accessor ret = classToAccessor.get(clazz);
 		if (ret != null) return ret;
-		return new Accessor(clazz);
+		ret = new Accessor(clazz);
+		classToAccessor.put(clazz, ret);
+		return ret;
 	}
 	
 	private Accessor(Class<?> clazz)
 	{
 		this.clazz = clazz;
 		this.populate();
-		classToAccessor.put(clazz, this);
 	}
 	
 	// -------------------------------------------- //
@@ -145,7 +146,6 @@ public class Accessor
 			if (Modifier.isFinal(field.getModifiers())) continue;
 			String fieldName = field.getName();
 			if (ret.containsKey(fieldName)) continue;
-			field.setAccessible(true);
 			ret.put(fieldName, field);
 		}
 		
diff --git a/src/com/massivecraft/massivecore/store/accessor/FieldAccessor.java b/src/com/massivecraft/massivecore/store/accessor/FieldAccessor.java
index 4f47fdac..0cc59b7e 100644
--- a/src/com/massivecraft/massivecore/store/accessor/FieldAccessor.java
+++ b/src/com/massivecraft/massivecore/store/accessor/FieldAccessor.java
@@ -2,6 +2,8 @@ package com.massivecraft.massivecore.store.accessor;
 
 import java.lang.reflect.Field;
 
+import com.massivecraft.massivecore.util.ReflectionUtil;
+
 public class FieldAccessor
 {
 	// -------------------------------------------- //
@@ -16,7 +18,7 @@ public class FieldAccessor
 	
 	public FieldAccessor(Field field)
 	{
-		field.setAccessible(true);
+		ReflectionUtil.makeAccessible(field);
 		this.field = field;
 	}