From a6e05ed6c2ad9d96d5d2b40a399e5c321fffb4e5 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Wed, 16 Nov 2016 12:43:16 +0300
Subject: juick-ws: threads are handled by babbler

---
 juick-ws/src/main/java/com/juick/ws/XMPPConnection.java | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'juick-ws/src/main/java/com/juick/ws/XMPPConnection.java')

diff --git a/juick-ws/src/main/java/com/juick/ws/XMPPConnection.java b/juick-ws/src/main/java/com/juick/ws/XMPPConnection.java
index 1b6eb3dc..c6ac5b50 100644
--- a/juick-ws/src/main/java/com/juick/ws/XMPPConnection.java
+++ b/juick-ws/src/main/java/com/juick/ws/XMPPConnection.java
@@ -29,11 +29,10 @@ import java.util.stream.Collectors;
 /**
  * @author ugnich
  */
-public class XMPPConnection implements InitializingBean, DisposableBean {
+public class XMPPConnection implements InitializingBean {
     private static final Logger logger = LoggerFactory.getLogger(XMPPConnection.class);
 
     private final JdbcTemplate jdbc;
-    private final ExecutorService service;
     private final WebsocketComponent wsHandler;
     private final String xmppPassword;
     private final MessageSerializer ms;
@@ -44,13 +43,11 @@ public class XMPPConnection implements InitializingBean, DisposableBean {
 
 
     public XMPPConnection(
-            final Environment env, final ExecutorService service, final WebsocketComponent wsHandler, final JdbcTemplate jdbc) {
+            final Environment env, final WebsocketComponent wsHandler, final JdbcTemplate jdbc) {
         Assert.notNull(env);
-        Assert.notNull(service);
         Assert.notNull(wsHandler);
         Assert.notNull(jdbc);
 
-        this.service = service;
         this.wsHandler = wsHandler;
         this.jdbc = jdbc;
 
@@ -93,13 +90,6 @@ public class XMPPConnection implements InitializingBean, DisposableBean {
         }
     }
 
-    @Override
-    public void destroy() throws Exception {
-        ThreadHelper.shutdownAndAwaitTermination(service);
-
-        logger.info("XMPPConnection destroyed");
-    }
-
     MessageSerializer messageSerializer = new MessageSerializer();
 
     private void onJuickPM(final int uid_to, final com.juick.Message jmsg) {
-- 
cgit v1.2.3