Merge pull request #3903 from ntherning/fix-NRE-in-Win32-IpcChannel.S…

…topListening-when-no-server-started Fix NRE in Win32 IpcChannel.StopListening() when no server started
mono · Nov 7, 2016 · 9f9d6ca · 9f9d6ca
2 parents 0176864 + da894a3
commit 9f9d6ca
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/IpcChannel.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/IpcChannel.cs
@@ -115,7 +115,8 @@ public string Parse(string url, out string objectURI)
 
         public void StartListening(object data)
         {
-            serverChannel.StartListening(data);
+            if (serverChannel != null)
+                serverChannel.StartListening(data);
         }
 
         public object ChannelData
@@ -128,7 +129,8 @@ public object ChannelData
 
         public void StopListening(object data)
         {
-            serverChannel.StopListening(data);
+            if (serverChannel != null)
+                serverChannel.StopListening(data);
         }
 
         public string[] GetUrlsForUri(string objectURI)