Fix null sessions in HttpContextWrapper.Session

[mono.git] / mcs / class / corlib / System.Collections / Queue.cs

diff --git a/mcs/class/corlib/System.Collections/Queue.cs b/mcs/class/corlib/System.Collections/Queue.cs
index 5d2cc75132671de45e482ad601f9069a0ae1db0d..5e359e821f4d5f1bf85e94360afa20587d2f0422 100644 (file)
--- a/mcs/class/corlib/System.Collections/Queue.cs
+++ b/mcs/class/corlib/System.Collections/Queue.cs
@@ -1,19 +1,51 @@
-//
+//
 // System.Collections.Queue
 //
 // Author:
-//    Ricardo Fernández Pascual
+//    Ricardo Fernández Pascual
+//
+// (C) 2001 Ricardo Fernández Pascual
+//
+
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
 //
-// (C) 2001 Ricardo Fernández Pascual
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
 using System;
 using System.Collections;
+using System.Runtime.InteropServices;
 
 namespace System.Collections {
 
+       [ComVisible(true)]
+       [System.Diagnostics.DebuggerDisplay ("Count={Count}")]
+       [System.Diagnostics.DebuggerTypeProxy (typeof (CollectionDebuggerView))]
        [Serializable]
-       public class Queue : ICollection, IEnumerable, ICloneable {
+#if INSIDE_CORLIB
+       public
+#else
+       internal
+#endif
+       class Queue : ICollection, IEnumerable, ICloneable {
 
                private object[] _array;
                private int _head = 0;   // points to the first used slot
@@ -23,24 +55,28 @@ namespace System.Collections {
                private int _version = 0;
 
                public Queue () : this (32, 2.0F) {}
-               public Queue (int initialCapacity) : this (initialCapacity, 2.0F) {}
+
+               public Queue (int capacity) : this (capacity, 2.0F) {}
+
                public Queue(ICollection col) : this (col == null ? 32 : col.Count)
                {
                        if (col == null)
                                throw new ArgumentNullException ("col");
                        
-                       _size = _array.Length;
-                       _tail = _size;
-                       col.CopyTo (_array, 0);
+                       // We have to do this because msft seems to call the
+                       // enumerator rather than CopyTo. This affects classes
+                       // like bitarray.
+                       foreach (object o in col)
+                               Enqueue (o);    
                }
                        
-               public Queue (int initialCapacity, float growFactor) {
-                       if (initialCapacity < 0)
+               public Queue (int capacity, float growFactor) {
+                       if (capacity < 0)
                                throw new ArgumentOutOfRangeException("capacity", "Needs a non-negative number");
                        if (!(growFactor >= 1.0F && growFactor <= 10.0F))
                                throw new ArgumentOutOfRangeException("growFactor", "Queue growth factor must be between 1.0 and 10.0, inclusive");
            
-                       _array = new object[initialCapacity];
+                       _array = new object[capacity];
 
                        this._growFactor = (int)(growFactor * 100);
                }
@@ -178,13 +214,15 @@ namespace System.Collections {
                        CopyTo (trimmed, 0);
                        _array = trimmed;
                        _head = 0;
-                       _tail = _head + _size;
+                       _tail = 0;
                }
 
                // private methods
 
                private void grow () {
                        int newCapacity = (_array.Length * _growFactor) / 100;
+                       if (newCapacity < _array.Length + 1)
+                               newCapacity = _array.Length + 1;
                        object[] newContents = new object[newCapacity];
                        CopyTo (newContents, 0);
                        _array = newContents;