diff options
author | KHobbits <rob@khobbits.co.uk> | 2014-05-27 06:18:34 +0100 |
---|---|---|
committer | KHobbits <rob@khobbits.co.uk> | 2014-05-27 06:18:34 +0100 |
commit | 00655f724d5db2a86ec53f63e16ed005bdb464fe (patch) | |
tree | b0f6513e1a62b5628c433b2e0bb0eb94a6c50025 | |
parent | 4590e7ea26d79bf8e46db302c8da1ea414521cf5 (diff) | |
download | Essentials-00655f724d5db2a86ec53f63e16ed005bdb464fe.tar Essentials-00655f724d5db2a86ec53f63e16ed005bdb464fe.tar.gz Essentials-00655f724d5db2a86ec53f63e16ed005bdb464fe.tar.lz Essentials-00655f724d5db2a86ec53f63e16ed005bdb464fe.tar.xz Essentials-00655f724d5db2a86ec53f63e16ed005bdb464fe.zip |
Revert writecount reset, this could cause odd behavior.
-rw-r--r-- | Essentials/src/com/earth2me/essentials/EssentialsConf.java | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsConf.java b/Essentials/src/com/earth2me/essentials/EssentialsConf.java index ce3d43280..0352007e8 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsConf.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsConf.java @@ -316,14 +316,12 @@ public class EssentialsConf extends YamlConfiguration } } + //This may be aborted if there are stagnant requests sitting in queue. + //This needs fixed to discard outstanding save requests. public synchronized void forceSave() { try { - if (pendingDiskWrites.get() > 0) - { - pendingDiskWrites.set(0); - } Future<?> future = delayedSave(configFile); if (future != null) { @@ -342,10 +340,7 @@ public class EssentialsConf extends YamlConfiguration public synchronized void cleanup() { - if (pendingDiskWrites.get() > 0) - { - forceSave(); - } + forceSave(); } private Future<?> delayedSave(final File file) @@ -362,11 +357,6 @@ public class EssentialsConf extends YamlConfiguration return null; } - if (pendingDiskWrites.incrementAndGet() < 0) - { - pendingDiskWrites.set(1); - } - Future<?> future = EXECUTOR_SERVICE.submit(new WriteRunner(configFile, data, pendingDiskWrites)); return future; |