Merge pull request #1624 from esdrubal/getprocesstimes

[mono.git] / mcs / class / System / System.Net / ServicePoint.cs

diff --git a/mcs/class/System/System.Net/ServicePoint.cs b/mcs/class/System/System.Net/ServicePoint.cs
index 1d72e569fdb75a85ae158aa851e2317bb6f3955f..2a2c1cb048fa6aa63336ee442c7902bb971fa39c 100644 (file)
--- a/mcs/class/System/System.Net/ServicePoint.cs
+++ b/mcs/class/System/System.Net/ServicePoint.cs
@@ -275,7 +275,7 @@ namespace System.Net
                        groups.Remove (group.Name);
                }
 
-               internal bool CheckAvailableForRecycling (out DateTime outIdleSince)
+               bool CheckAvailableForRecycling (out DateTime outIdleSince)
                {
                        outIdleSince = DateTime.MinValue;
 
@@ -314,7 +314,8 @@ namespace System.Net
 
                                if (removeList != null) {
                                        foreach (var group in removeList)
-                                               RemoveConnectionGroup (group);
+                                               if (groups.ContainsKey (group.Name))
+                                                       RemoveConnectionGroup (group);
                                }
 
                                if (groups != null && groups.Count == 0)
@@ -381,7 +382,6 @@ namespace System.Net
                        protocolVersion = version;
                }
 
-#if !TARGET_JVM
                internal EventHandler SendRequest (HttpWebRequest request, string groupName)
                {
                        WebConnection cnc;
@@ -399,13 +399,13 @@ namespace System.Net
                        
                        return cnc.SendRequest (request);
                }
-#endif
                public bool CloseConnectionGroup (string connectionGroupName)
                {
                        lock (this) {
                                WebConnectionGroup cncGroup = GetConnectionGroup (connectionGroupName);
                                if (cncGroup != null) {
                                        cncGroup.Close ();
+                                       RemoveConnectionGroup (cncGroup);
                                        return true;
                                }
                        }