From 2723ee45554147c9d2e96c36145607d9c1bac256 Mon Sep 17 00:00:00 2001
From: Tobias Eidelpes <tobias@eidelpes.info>
Date: Thu, 12 Nov 2020 18:08:24 +0100
Subject: [PATCH] Start DMTPListener during MailboxServer startup

---
 src/main/java/dslab/mailbox/MailboxServer.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/dslab/mailbox/MailboxServer.java b/src/main/java/dslab/mailbox/MailboxServer.java
index c393ade..615c3f2 100644
--- a/src/main/java/dslab/mailbox/MailboxServer.java
+++ b/src/main/java/dslab/mailbox/MailboxServer.java
@@ -24,6 +24,8 @@ public class MailboxServer implements IMailboxServer, Runnable {
     private final Shell shell;
     private final Integer dmtpServerPort;
     private final Integer dmapServerPort;
+    private DMTPListener dmtpListener;
+    private DMAPListener dmapListener;
     private final ConcurrentHashMap<Email, LinkedList<Message>> messageStorage = new ConcurrentHashMap<>();
     private final ConcurrentHashMap<String, String> userStorage = new ConcurrentHashMap<>();
 
@@ -67,7 +69,8 @@ public class MailboxServer implements IMailboxServer, Runnable {
             e.printStackTrace();
             shutdown();
         }
-        // TODO spawn listener for transfer servers (DMTPListener)
+        this.dmtpListener = new DMTPListener(this.dmtpServerSocket, this.messageStorage);
+        this.dmtpListener.start();
         // TODO spawn listener for user clients (DMAPListener)
         this.shell.run();
     }
@@ -80,6 +83,7 @@ public class MailboxServer implements IMailboxServer, Runnable {
         try {
             if (dmtpServerSocket != null)
                 dmtpServerSocket.close();
+            this.dmtpListener.interrupt();
         } catch (IOException e) {
             logger.severe("Error closing DMTP serverSocket " + dmtpServerSocket.toString());
             e.printStackTrace();