Merge pull request #4 from eitamb/master

Bug fixes from main repository
NetMQ · May 6, 2016 · 66bb52f · 66bb52f
2 parents 3841186 + ac53f1d
commit 66bb52f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/src/NetMQ/Core/SocketBase.cs b/src/NetMQ/Core/SocketBase.cs
@@ -1204,7 +1204,6 @@ protected virtual void XHiccuped([NotNull] Pipe pipe)
         /// <summary>
         /// Handle input-ready events by receiving and processing any incoming commands.
         /// </summary>
-        /// <exception cref="TerminatingException">the context must not already be terminating</exception>
         public virtual void InEvent()
         {
             // This function is invoked only once the socket is running in the context
@@ -1216,6 +1215,10 @@ public virtual void InEvent()
             {
                 ProcessCommands(0, false);
             }
+            catch
+            {
+                // ignored
+            }
             finally
             {
                 CheckDestroy();

diff --git a/src/NetMQ/Devices/DeviceBase.cs b/src/NetMQ/Devices/DeviceBase.cs
@@ -158,6 +158,7 @@ public void Stop(bool waitForCloseToComplete = true)
 
             FrontendSocket.Close();
             BackendSocket.Close();
+            m_poller.Dispose();
             IsRunning = false;
         }
 

diff --git a/src/NetMQ/INetMQPoller.cs b/src/NetMQ/INetMQPoller.cs
@@ -1,6 +1,8 @@
+using System;
+
 namespace NetMQ
 {
-    public interface INetMQPoller
+    public interface INetMQPoller : IDisposable
     {
         void Run();
         void RunAsync();

diff --git a/src/NetMQ/NetMQBeacon.cs b/src/NetMQ/NetMQBeacon.cs
@@ -145,9 +145,10 @@ public void Run(PairSocket shim)
                 m_pingTimer.Elapsed += PingElapsed;
                 m_pingTimer.Enable = false;
 
-                m_poller = new NetMQPoller { m_pipe, m_pingTimer };
-
-                m_poller.Run();
+                using (m_poller = new NetMQPoller { m_pipe, m_pingTimer })
+                {
+                  m_poller.Run();
+                }
 
                 // the beacon might never been configured
                 if (m_udpSocket != null)