Fix serious bug in Dev2.7.137 - Dev2.7.144: if spawn.yml is not present, the server will run into a deadlock.

1 files changed, 19 insertions, 20 deletions

diff --git a/Essentials/src/com/earth2me/essentials/storage/AbstractDelayedYamlFileReader.java b/Essentials/src/com/earth2me/essentials/storage/AbstractDelayedYamlFileReader.java
index 1f2887d88..43bfc358d 100644
--- a/Essentials/src/com/earth2me/essentials/storage/AbstractDelayedYamlFileReader.java
+++ b/Essentials/src/com/earth2me/essentials/storage/AbstractDelayedYamlFileReader.java
@@ -6,6 +6,7 @@ import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.logging.Level;
+import java.util.logging.Logger;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.Plugin;
 import org.yaml.snakeyaml.error.YAMLException;
@@ -30,39 +31,37 @@ public abstract class AbstractDelayedYamlFileReader<T extends StorageObject> imp
 	@Override
 	public void run()
 	{
-		FileReader reader = null;
+		onStart();
 		try
 		{
-			onStart();
+			final FileReader reader = new FileReader(file);
 			try
 			{
-				reader = new FileReader(file);
-				T object = new YamlStorageReader(reader, plugin).load(clazz);
+				final T object = new YamlStorageReader(reader, plugin).load(clazz);
 				onSuccess(object);
 			}
-			catch (ObjectLoadException ex)
+			finally
 			{
-				onException();
-				Bukkit.getLogger().log(Level.SEVERE, "File broken: " + file.toString(), ex.getCause());
+				try
+				{
+					reader.close();
+				}
+				catch (IOException ex)
+				{
+					Bukkit.getLogger().log(Level.SEVERE, "File can't be closed: " + file.toString(), ex);
+				}
 			}
+
 		}
 		catch (FileNotFoundException ex)
 		{
-			Bukkit.getLogger().log(Level.SEVERE, file.toString(), ex);
+			onException();
+			Bukkit.getLogger().log(Level.WARNING, "File not found: " + file.toString());
 		}
-		finally
+		catch (ObjectLoadException ex)
 		{
-			try
-			{
-				if (reader != null)
-				{
-					reader.close();
-				}
-			}
-			catch (IOException ex)
-			{
-				Bukkit.getLogger().log(Level.SEVERE, ex.getMessage(), ex);
-			}
+			onException();
+			Bukkit.getLogger().log(Level.SEVERE, "File broken: " + file.toString(), ex.getCause());
 		}
 	}