minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-11 17:15:07 +02:00
Code Issues Releases Wiki Activity

Revert writecount reset, this could cause odd behavior.

Browse Source
This commit is contained in:
KHobbits
2014-05-27 06:18:34 +01:00
parent 85b8ee2e2d
commit 7402ff69da
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Essentials/src/com/earth2me/essentials/EssentialsConf.java
View File

@@ -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() public synchronized void forceSave()
{ {
try try
{ {
if (pendingDiskWrites.get() > 0)
{
pendingDiskWrites.set(0);
}
Future<?> future = delayedSave(configFile); Future<?> future = delayedSave(configFile);
if (future != null) if (future != null)
{ {
@@ -341,12 +339,9 @@ public class EssentialsConf extends YamlConfiguration
} }
public synchronized void cleanup() public synchronized void cleanup()
{
if (pendingDiskWrites.get() > 0)
{ {
forceSave(); forceSave();
} }
}
private Future<?> delayedSave(final File file) private Future<?> delayedSave(final File file)
{ {
@@ -362,11 +357,6 @@ public class EssentialsConf extends YamlConfiguration
return null; return null;
} }
if (pendingDiskWrites.incrementAndGet() < 0)
{
pendingDiskWrites.set(1);
}
Future<?> future = EXECUTOR_SERVICE.submit(new WriteRunner(configFile, data, pendingDiskWrites)); Future<?> future = EXECUTOR_SERVICE.submit(new WriteRunner(configFile, data, pendingDiskWrites));
return future; return future;