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 663816eb9e71e84c03da2dc6f8420b84784d2834..2a2c1cb048fa6aa63336ee442c7902bb971fa39c 100644 (file)
--- a/mcs/class/System/System.Net/ServicePoint.cs
+++ b/mcs/class/System/System.Net/ServicePoint.cs
@@ -52,7 +52,6 @@ namespace System.Net
                X509Certificate clientCertificate;
                IPHostEntry host;
                bool usesProxy;
-               WebConnectionGroup firstGroup;
                Dictionary<string,WebConnectionGroup> groups;
                bool sendContinue = true;
                bool useConnect;
@@ -255,56 +254,35 @@ namespace System.Net
                         */
 
                        WebConnectionGroup group;
-                       if (firstGroup != null && name == firstGroup.Name)
-                               return firstGroup;
                        if (groups != null && groups.TryGetValue (name, out group))
                                return group;
 
                        group = new WebConnectionGroup (this, name);
                        group.ConnectionClosed += (s, e) => currentConnections--;
 
-                       if (firstGroup == null)
-                               firstGroup = group;
-                       else {
-                               if (groups == null)
-                                       groups = new Dictionary<string, WebConnectionGroup> ();
-                               groups.Add (name, group);
-                       }
+                       if (groups == null)
+                               groups = new Dictionary<string, WebConnectionGroup> ();
+                       groups.Add (name, group);
 
                        return group;
                }
 
                void RemoveConnectionGroup (WebConnectionGroup group)
                {
-                       if (groups == null || groups.Count == 0) {
-                               // No more connection groups left.
-                               if (group != firstGroup)
-                                       throw new InvalidOperationException ();
-                               else
-                                       firstGroup = null;
-                               return;
-                       }
+                       if (groups == null || groups.Count == 0)
+                               throw new InvalidOperationException ();
 
-                       if (group == firstGroup) {
-                               // Steal one entry from the dictionary.
-                               var en = groups.GetEnumerator ();
-                               en.MoveNext ();
-                               firstGroup = en.Current.Value;
-                               groups.Remove (en.Current.Key);
-                       } else {
-                               groups.Remove (group.Name);
-                       }
+                       groups.Remove (group.Name);
                }
 
-               internal bool CheckAvailableForRecycling (out DateTime outIdleSince)
+               bool CheckAvailableForRecycling (out DateTime outIdleSince)
                {
                        outIdleSince = DateTime.MinValue;
 
                        TimeSpan idleTimeSpan;
-                       WebConnectionGroup singleGroup, singleRemove = null;
                        List<WebConnectionGroup> groupList = null, removeList = null;
                        lock (this) {
-                               if (firstGroup == null) {
+                               if (groups == null || groups.Count == 0) {
                                        idleSince = DateTime.MinValue;
                                        return true;
                                }
@@ -320,41 +298,34 @@ namespace System.Net
                                 * 
                                 */
 
-                               singleGroup = firstGroup;
-                               if (groups != null)
-                                       groupList = new List<WebConnectionGroup> (groups.Values);
+                               groupList = new List<WebConnectionGroup> (groups.Values);
                        }
 
-                       if (singleGroup.TryRecycle (idleTimeSpan, ref outIdleSince))
-                               singleRemove = singleGroup;
-
-                       if (groupList != null) {
-                               foreach (var group in groupList) {
-                                       if (!group.TryRecycle (idleTimeSpan, ref outIdleSince))
-                                               continue;
-                                       if (removeList == null)
-                                               removeList = new List<WebConnectionGroup> ();
-                                       removeList.Add (group);
-                               }
+                       foreach (var group in groupList) {
+                               if (!group.TryRecycle (idleTimeSpan, ref outIdleSince))
+                                       continue;
+                               if (removeList == null)
+                                       removeList = new List<WebConnectionGroup> ();
+                               removeList.Add (group);
                        }
 
                        lock (this) {
                                idleSince = outIdleSince;
 
-                               if (singleRemove != null)
-                                       RemoveConnectionGroup (singleRemove);
-
                                if (removeList != null) {
                                        foreach (var group in removeList)
-                                               RemoveConnectionGroup (group);
+                                               if (groups.ContainsKey (group.Name))
+                                                       RemoveConnectionGroup (group);
                                }
 
                                if (groups != null && groups.Count == 0)
                                        groups = null;
 
-                               if (firstGroup == null) {
-                                       idleTimer.Dispose ();
-                                       idleTimer = null;
+                               if (groups == null) {
+                                       if (idleTimer != null) {
+                                               idleTimer.Dispose ();
+                                               idleTimer = null;
+                                       }
                                        return true;
                                }
 
@@ -411,7 +382,6 @@ namespace System.Net
                        protocolVersion = version;
                }
 
-#if !TARGET_JVM
                internal EventHandler SendRequest (HttpWebRequest request, string groupName)
                {
                        WebConnection cnc;
@@ -429,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;
                                }
                        }