static components are evil

1 files changed, 9 insertions, 3 deletions

diff --git a/src/main/java/com/juick/xmpp/s2s/ConnectionListener.java b/src/main/java/com/juick/xmpp/s2s/ConnectionListener.java
index 569d3db0..607397a8 100644
--- a/src/main/java/com/juick/xmpp/s2s/ConnectionListener.java
+++ b/src/main/java/com/juick/xmpp/s2s/ConnectionListener.java
@@ -13,6 +13,12 @@ public class ConnectionListener implements Runnable {
 
     private static final Logger logger = Logger.getLogger(ConnectionListener.class.getName());
 
+    XMPPComponent xmpp;
+
+    public ConnectionListener(XMPPComponent xmpp) {
+        this.xmpp = xmpp;
+    }
+
     @Override
     public void run() {
         try {
@@ -21,9 +27,9 @@ public class ConnectionListener implements Runnable {
             while (true) {
                 try {
                     Socket socket = listener.accept();
-                    ConnectionIn client = new ConnectionIn(socket);
-                    XMPPComponent.addConnectionIn(client);
-                    XMPPComponent.executorService.submit(client);
+                    ConnectionIn client = new ConnectionIn(xmpp, new JuickBot(xmpp), socket);
+                    xmpp.addConnectionIn(client);
+                    xmpp.executorService.submit(client);
                 } catch (Exception e) {
                     logger.log(Level.SEVERE, "s2s error", e);
                 }