#2520: Fix ConcurrentModificationException when tasks are cancelled during shutdown

2018-08-28 09:25:50 +02:00
parent 1bb826109c
commit 16b3490576
1 changed files with 5 additions and 2 deletions
--- a/proxy/src/main/java/net/md_5/bungee/scheduler/BungeeScheduler.java
+++ b/proxy/src/main/java/net/md_5/bungee/scheduler/BungeeScheduler.java
@@ -62,10 +62,13 @@ public class BungeeScheduler implements TaskScheduler
    public int cancel(Plugin plugin)
    {
        Set<ScheduledTask> toRemove = new HashSet<>();
+        synchronized ( lock )
+        {
            for ( ScheduledTask task : tasksByPlugin.get( plugin ) )
            {
                toRemove.add( task );
            }
+        }
        for ( ScheduledTask task : toRemove )
        {
            cancel( task );