Finished Protect, Essentials should build now.

1 files changed, 42 insertions, 37 deletions

diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java
index 6f724ac87..b208b5e43 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsConnect.java
@@ -72,54 +72,59 @@ public class EssentialsConnect
 			{
 				protect.getStorage().onPluginDeactivation();
 			}
-			
-			/*for (ProtectConfig protectConfig : ProtectConfig.values())
-			{
-				if (protectConfig.isList())
-				{
-					protect.getSettingsList().put(protectConfig, ess.getSettings().getProtectList(protectConfig.getConfigName()));
-				}
-				else if (protectConfig.isString())
-				{
-					protect.getSettingsString().put(protectConfig, ess.getSettings().getProtectString(protectConfig.getConfigName()));
-				}
-				else
-				{
-					protect.getSettingsBoolean().put(protectConfig, ess.getSettings().getProtectBoolean(protectConfig.getConfigName(), protectConfig.getDefaultValueBoolean()));
-				}
 
-			}*/
+			/*
+			 * for (ProtectConfig protectConfig : ProtectConfig.values()) { if (protectConfig.isList()) {
+			 * protect.getSettingsList().put(protectConfig,
+			 * ess.getSettings().getProtectList(protectConfig.getConfigName())); } else if (protectConfig.isString()) {
+			 * protect.getSettingsString().put(protectConfig,
+			 * ess.getSettings().getProtectString(protectConfig.getConfigName())); } else {
+			 * protect.getSettingsBoolean().put(protectConfig,
+			 * ess.getSettings().getProtectBoolean(protectConfig.getConfigName(),
+			 * protectConfig.getDefaultValueBoolean())); }
+			 *
+			 * }
+			 */
 
-			if (protect.getSettingString(ProtectConfig.datatype).equalsIgnoreCase("mysql"))
+			ProtectHolder settings = protect.getSettings();
+			settings.acquireReadLock();
+			try
 			{
-				try
+				if (settings.getData().getDbtype().equalsIgnoreCase("mysql"))
 				{
-					protect.setStorage(new ProtectedBlockMySQL(
-							protect.getSettingString(ProtectConfig.mysqlDB),
-							protect.getSettingString(ProtectConfig.dbUsername),
-							protect.getSettingString(ProtectConfig.dbPassword)));
+					try
+					{
+						protect.setStorage(new ProtectedBlockMySQL(
+								settings.getData().getDburl(),
+								settings.getData().getDbuser(),
+								settings.getData().getDbpassword()));
+					}
+					catch (PropertyVetoException ex)
+					{
+						LOGGER.log(Level.SEVERE, null, ex);
+					}
 				}
-				catch (PropertyVetoException ex)
-				{
-					LOGGER.log(Level.SEVERE, null, ex);
-				}
-			}
-			else
-			{
-				try
+				else
 				{
-					protect.setStorage(new ProtectedBlockSQLite("jdbc:sqlite:plugins/Essentials/EssentialsProtect.db"));
+					try
+					{
+						protect.setStorage(new ProtectedBlockSQLite("jdbc:sqlite:plugins/Essentials/EssentialsProtect.db"));
+					}
+					catch (PropertyVetoException ex)
+					{
+						LOGGER.log(Level.SEVERE, null, ex);
+					}
 				}
-				catch (PropertyVetoException ex)
+				/*if (protect.getSettingBool(ProtectConfig.memstore))
 				{
-					LOGGER.log(Level.SEVERE, null, ex);
-				}
+					protect.setStorage(new ProtectedBlockMemory(protect.getStorage(), protect));
+				}*/
+
 			}
-			if (protect.getSettingBool(ProtectConfig.memstore))
+			finally
 			{
-				protect.setStorage(new ProtectedBlockMemory(protect.getStorage(), protect));
+				settings.unlock();
 			}
-
 		}
 	}
 }