Use separate object for syncing the shutdown.

diff --git a/src/main/java/net/pterodactylus/xdcc/core/Core.java b/src/main/java/net/pterodactylus/xdcc/core/Core.java
index 1b45c6a..7355283 100644 (file)
--- a/src/main/java/net/pterodactylus/xdcc/core/Core.java
+++ b/src/main/java/net/pterodactylus/xdcc/core/Core.java
@@ -105,6 +105,7 @@ public class Core extends AbstractExecutionThreadService {
        /** The logger. */
        private static final Logger logger = Logger.getLogger(Core.class.getName());
 
+       private final Object syncObject = new Object();
        /** The event bus. */
        private final EventBus eventBus;
        private final ConnectionFactory connectionFactory;
@@ -376,10 +377,12 @@ public class Core extends AbstractExecutionThreadService {
        @Override
        protected void run() throws Exception {
                while (isRunning()) {
-                       try {
-                               Thread.sleep(TimeUnit.MINUTES.toMillis(1));
-                       } catch (InterruptedException ie1) {
-                               /* ignore. */
+                       synchronized (syncObject) {
+                               try {
+                                       syncObject.wait(TimeUnit.MINUTES.toMillis(1));
+                               } catch (InterruptedException ie1) {
+                                       /* ignore. */
+                               }
                        }
 
                        /* find channels that should be monitored but are not. */
@@ -409,6 +412,9 @@ public class Core extends AbstractExecutionThreadService {
 
        @Override
        protected void shutDown() {
+               synchronized (syncObject) {
+                       syncObject.notifyAll();
+               }
        }
 
        //