From 4f88f23f330c4acb917b4d0821ee4535ce374857 Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flo@geekplace.eu>
Date: Mon, 26 Feb 2018 10:23:02 +0100
Subject: [PATCH] Make scheduled executor service static

---
 .../smack/AbstractXMPPConnection.java         | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java b/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java
index 06af3d2ba..df05224ec 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java
@@ -79,6 +79,7 @@ import org.jivesoftware.smack.parsing.ParsingExceptionCallback;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
 import org.jivesoftware.smack.provider.ProviderManager;
 import org.jivesoftware.smack.sasl.core.SASLAnonymous;
+import org.jivesoftware.smack.util.Async;
 import org.jivesoftware.smack.util.DNSUtil;
 import org.jivesoftware.smack.util.Objects;
 import org.jivesoftware.smack.util.PacketParserUtils;
@@ -238,8 +239,16 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
     /**
      * This scheduled thread pool executor is used to remove pending callbacks.
      */
-    private final ScheduledExecutorService removeCallbacksService = Executors.newSingleThreadScheduledExecutor(
-                    new SmackExecutorThreadFactory(this, "Remove Callbacks"));
+    protected static final ScheduledExecutorService SCHEDULED_EXECUTOR_SERVICE = Executors.newSingleThreadScheduledExecutor(
+            new ThreadFactory() {
+                @Override
+                public Thread newThread(Runnable runnable) {
+                    Thread thread = new Thread(runnable);
+                    thread.setName("Smack Scheduled Executor Service");
+                    thread.setDaemon(true);
+                    return thread;
+                }
+            });
 
     /**
      * A cached thread pool executor service with custom thread factory to set meaningful names on the threads and set
@@ -1407,7 +1416,6 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
             // reference to their ExecutorService which prevents the ExecutorService from being
             // gc'ed. It is possible that the XMPPConnection instance is gc'ed while the
             // listenerExecutor ExecutorService call not be gc'ed until it got shut down.
-            removeCallbacksService.shutdownNow();
             singleThreadedExecutorService.shutdownNow();
         } catch (Throwable t) {
             LOGGER.log(Level.WARNING, "finalize() threw trhowable", t);
@@ -1560,7 +1568,13 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
                     } else {
                         exception = NoResponseException.newWith(AbstractXMPPConnection.this, replyFilter);
                     }
-                    exceptionCallback.processException(exception);
+                    final Exception exceptionToProcess = exception;
+                    Async.go(new Runnable() {
+                        @Override
+                        public void run() {
+                            exceptionCallback.processException(exceptionToProcess);
+                        }
+                    });
                 }
             }
         }, timeout, TimeUnit.MILLISECONDS);
@@ -1687,6 +1701,6 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
     }
 
     protected final ScheduledFuture<?> schedule(Runnable runnable, long delay, TimeUnit unit) {
-        return removeCallbacksService.schedule(runnable, delay, unit);
+        return SCHEDULED_EXECUTOR_SERVICE.schedule(runnable, delay, unit);
     }
 }