ICE-6302 Fixed SessionHelper to terminate connection attempt when destroy is called

1 files changed, 25 insertions, 6 deletions

diff --git a/csharp/src/Glacier2/SessionHelper.cs b/csharp/src/Glacier2/SessionHelper.cs
index f9432d6003f..d1f60742c74 100644
--- a/csharp/src/Glacier2/SessionHelper.cs
+++ b/csharp/src/Glacier2/SessionHelper.cs
@@ -76,20 +76,22 @@ public class SessionHelper
             if(!_connected)
             {
                 //
-                // In this case a connecting session is being
-                // destroyed. The communicator and session will be
-                // destroyed when the connection establishment has
-                // completed.
+                // In this case a connecting session is being destroyed.
+                // We destroy the communicator to trigger the immediate
+                // failure of the connection establishment.
                 //
+                Thread t1 = new Thread(new ThreadStart(destroyCommunicator));
+                t1.Start();
                 return;
             }
             _session = null;
             _connected = false;
+
             //
             // Run destroyInternal in a thread because it makes remote invocations.
             //
-            Thread t = new Thread(new ThreadStart(destroyInternal));
-            t.Start();
+            Thread t2 = new Thread(new ThreadStart(destroyInternal));
+            t2.Start();
         }
     }
 
@@ -394,6 +396,23 @@ public class SessionHelper
             }, null);
     }
 
+    private void
+    destroyCommunicator()
+    {
+        Ice.Communicator communicator;
+        lock(this)
+        {
+            communicator = _communicator;
+        }
+        try
+        {
+            communicator.destroy();
+        }
+        catch(Exception)
+        {
+        }
+    }
+
     delegate Glacier2.SessionPrx ConnectStrategy(Glacier2.RouterPrx router);
 
     private void