Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-11-27 21:15:57 +01:00
Code Issues Projects Releases Wiki Activity

Fix shutdown guard not working.

Browse Source
This commit is contained in:
sk89q 2014-08-02 21:08:11 -07:00
parent fafd3aba6a
commit 9a852f4cbe
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java
View File

@ -19,6 +19,7 @@
package com.sk89q.worldguard.bukkit; package com.sk89q.worldguard.bukkit;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.ListeningExecutorService;
import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.MoreExecutors;
import com.sk89q.bukkit.util.CommandsManagerRegistration; import com.sk89q.bukkit.util.CommandsManagerRegistration;
@ -83,6 +84,7 @@
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CancellationException; import java.util.concurrent.CancellationException;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.jar.JarFile; import java.util.jar.JarFile;
@ -252,7 +254,7 @@ public void run() {
@Override @Override
public void onDisable() { public void onDisable() {
executorService.shutdownNow(); executorService.shutdown();
try { try {
getLogger().log(Level.INFO, "Shutting down executor and waiting for any pending tasks..."); getLogger().log(Level.INFO, "Shutting down executor and waiting for any pending tasks...");
@ -267,9 +269,12 @@ public void onDisable() {
getLogger().log(Level.INFO, builder.toString()); getLogger().log(Level.INFO, builder.toString());
} }
Futures.successfulAsList(tasks).get();
executorService.awaitTermination(Integer.MAX_VALUE, TimeUnit.DAYS); executorService.awaitTermination(Integer.MAX_VALUE, TimeUnit.DAYS);
} catch (InterruptedException e) { } catch (InterruptedException e) {
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
} catch (ExecutionException e) {
getLogger().log(Level.WARNING, "Some tasks failed while waiting for remaining tasks to finish", e);
} }
globalRegionManager.unload(); globalRegionManager.unload();