Merge pull request mtconnect#2 from NLandry91/master

Fixed thread exception issue for MTCAdapter class
lcicala · Apr 28, 2017 · 85700ab · 85700ab
2 parents 44ba2ab + 1d4d040
commit 85700ab
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/MTCAdapter.cs b/src/MTCAdapter.cs
@@ -528,6 +528,7 @@ private void ListenForClients()
                     clientThread.Start(client);
 
                     SendAllTo(client.GetStream());
+                    clientThread.Join();
                 }
             }
             catch (Exception e)
@@ -562,17 +563,17 @@ public void Stop()
         {
             if (mRunning) {
                 mRunning = false;
-                mListener.Stop();
+
+                // Wait 2 seconds for the thread to exit.
+                mListenThread.Join(2*Heartbeat);
+
                 foreach (Object obj in mClients)
                 {
                     Stream client = (Stream)obj;
                     client.Close();
                 }
                 mClients.Clear();
 
-                // Wait 5 seconds for the thread to exit.
-                mListenThread.Join(2000);
-
                 // Wait for all client threads to exit.
                 mActiveClients.Wait(2000);
             }