diff options
| author | snowleo <schneeleo@gmail.com> | 2011-07-19 10:34:02 +0200 |
|---|---|---|
| committer | snowleo <schneeleo@gmail.com> | 2011-07-19 10:34:02 +0200 |
| commit | 4a963b22f128756340d59ca601b1625637ca9aa5 (patch) | |
| tree | 20a21ce726cab2b7820d7fd538fdb59f85ea2e6a /EssentialsProtect/src/com | |
| parent | 150a0e0ddddc421e2a68dc7fa9d39b565beca439 (diff) | |
| download | Essentials-4a963b22f128756340d59ca601b1625637ca9aa5.tar Essentials-4a963b22f128756340d59ca601b1625637ca9aa5.tar.gz Essentials-4a963b22f128756340d59ca601b1625637ca9aa5.tar.lz Essentials-4a963b22f128756340d59ca601b1625637ca9aa5.tar.xz Essentials-4a963b22f128756340d59ca601b1625637ca9aa5.zip | |
Close database connections on plugin deactivation
Diffstat (limited to 'EssentialsProtect/src/com')
4 files changed, 22 insertions, 1 deletions
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java index 216a37564..ed02291cf 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java @@ -12,7 +12,9 @@ import java.beans.PropertyVetoException; import java.util.EnumMap; import java.util.List; import java.util.Map; +import java.util.logging.Filter; import java.util.logging.Level; +import java.util.logging.LogRecord; import java.util.logging.Logger; import org.bukkit.Location; import org.bukkit.entity.Player; @@ -59,7 +61,7 @@ public class EssentialsProtect extends JavaPlugin implements IConf, IProtect pm.registerEvent(Type.LIGHTNING_STRIKE, weatherListener, Priority.Highest, this); pm.registerEvent(Type.THUNDER_CHANGE, weatherListener, Priority.Highest, this); pm.registerEvent(Type.WEATHER_CHANGE, weatherListener, Priority.Highest, this); - + reloadConfig(); ess.addReloadListener(this); if (!this.getDescription().getVersion().equals(ess.getDescription().getVersion())) @@ -96,6 +98,10 @@ public class EssentialsProtect extends JavaPlugin implements IConf, IProtect public void reloadConfig() { + if (storage != null) + { + storage.onPluginDeactivation(); + } for (ProtectConfig protectConfig : ProtectConfig.values()) { if (protectConfig.isList()) @@ -166,6 +172,10 @@ public class EssentialsProtect extends JavaPlugin implements IConf, IProtect public void onDisable() { + if (storage != null) + { + storage.onPluginDeactivation(); + } } public IEssentials getEssentials() diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/data/IProtectedBlock.java b/EssentialsProtect/src/com/earth2me/essentials/protect/data/IProtectedBlock.java index 6580ce7f8..271f1c464 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/data/IProtectedBlock.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/data/IProtectedBlock.java @@ -11,4 +11,5 @@ public interface IProtectedBlock { public boolean isProtected(Block block, String playerName); public List<String> getOwners(Block block); public int unprotectBlock(Block block); + public void onPluginDeactivation(); } diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/data/ProtectedBlockJDBC.java b/EssentialsProtect/src/com/earth2me/essentials/protect/data/ProtectedBlockJDBC.java index e6b3c7592..e24a71b80 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/data/ProtectedBlockJDBC.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/data/ProtectedBlockJDBC.java @@ -418,4 +418,9 @@ public abstract class ProtectedBlockJDBC implements IProtectedBlock } } } + + public void onPluginDeactivation() + { + cpds.close(); + } } diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/data/ProtectedBlockMemory.java b/EssentialsProtect/src/com/earth2me/essentials/protect/data/ProtectedBlockMemory.java index 2fd32b026..1348b6bc8 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/data/ProtectedBlockMemory.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/data/ProtectedBlockMemory.java @@ -245,4 +245,9 @@ public class ProtectedBlockMemory implements IProtectedBlock } return id; } + + public void onPluginDeactivation() + { + storage.onPluginDeactivation(); + } } |