ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/main/java/util/PriorityQueue.java
(Generate patch)

Comparing jsr166/src/main/java/util/PriorityQueue.java (file contents):
Revision 1.62 by jsr166, Thu Feb 16 08:17:21 2006 UTC vs.
Revision 1.69 by jsr166, Sun May 18 23:59:57 2008 UTC

# Line 1 | Line 1
1   /*
2 < * %W% %E%
2 > * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
3 > * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4   *
5 < * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
6 < * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
5 > * This code is free software; you can redistribute it and/or modify it
6 > * under the terms of the GNU General Public License version 2 only, as
7 > * published by the Free Software Foundation.  Sun designates this
8 > * particular file as subject to the "Classpath" exception as provided
9 > * by Sun in the LICENSE file that accompanied this code.
10 > *
11 > * This code is distributed in the hope that it will be useful, but WITHOUT
12 > * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
13 > * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
14 > * version 2 for more details (a copy is included in the LICENSE file that
15 > * accompanied this code).
16 > *
17 > * You should have received a copy of the GNU General Public License version
18 > * 2 along with this work; if not, write to the Free Software Foundation,
19 > * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
20 > *
21 > * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
22 > * CA 95054 USA or visit www.sun.com if you need additional information or
23 > * have any questions.
24   */
25  
26   package java.util;
27  
28   /**
29 < * An unbounded priority {@linkplain Queue queue} based on a priority
30 < * heap.  The elements of the priority queue are ordered according to
31 < * their {@linkplain Comparable natural ordering}, or by a {@link
32 < * Comparator} provided at queue construction time, depending on which
33 < * constructor is used.  A priority queue does not permit
34 < * <tt>null</tt> elements.  A priority queue relying on natural
35 < * ordering also does not permit insertion of non-comparable objects
36 < * (doing so may result in <tt>ClassCastException</tt>).
29 > * An unbounded priority {@linkplain Queue queue} based on a priority heap.
30 > * The elements of the priority queue are ordered according to their
31 > * {@linkplain Comparable natural ordering}, or by a {@link Comparator}
32 > * provided at queue construction time, depending on which constructor is
33 > * used.  A priority queue does not permit {@code null} elements.
34 > * A priority queue relying on natural ordering also does not permit
35 > * insertion of non-comparable objects (doing so may result in
36 > * {@code ClassCastException}).
37   *
38   * <p>The <em>head</em> of this queue is the <em>least</em> element
39   * with respect to the specified ordering.  If multiple elements are
40   * tied for least value, the head is one of those elements -- ties are
41 < * broken arbitrarily.  The queue retrieval operations <tt>poll</tt>,
42 < * <tt>remove</tt>, <tt>peek</tt>, and <tt>element</tt> access the
41 > * broken arbitrarily.  The queue retrieval operations {@code poll},
42 > * {@code remove}, {@code peek}, and {@code element} access the
43   * element at the head of the queue.
44   *
45   * <p>A priority queue is unbounded, but has an internal
# Line 36 | Line 54 | package java.util;
54   * Iterator} interfaces.  The Iterator provided in method {@link
55   * #iterator()} is <em>not</em> guaranteed to traverse the elements of
56   * the priority queue in any particular order. If you need ordered
57 < * traversal, consider using <tt>Arrays.sort(pq.toArray())</tt>.
57 > * traversal, consider using {@code Arrays.sort(pq.toArray())}.
58   *
59   * <p> <strong>Note that this implementation is not synchronized.</strong>
60 < * Multiple threads should not access a <tt>PriorityQueue</tt>
61 < * instance concurrently if any of the threads modifies the list
62 < * structurally. Instead, use the thread-safe {@link
60 > * Multiple threads should not access a {@code PriorityQueue}
61 > * instance concurrently if any of the threads modifies the queue.
62 > * Instead, use the thread-safe {@link
63   * java.util.concurrent.PriorityBlockingQueue} class.
64   *
65 < * <p>Implementation note: this implementation provides O(log(n)) time
66 < * for the insertion methods (<tt>offer</tt>, <tt>poll</tt>,
67 < * <tt>remove()</tt> and <tt>add</tt>) methods; linear time for the
68 < * <tt>remove(Object)</tt> and <tt>contains(Object)</tt> methods; and
69 < * constant time for the retrieval methods (<tt>peek</tt>,
70 < * <tt>element</tt>, and <tt>size</tt>).
65 > * <p>Implementation note: this implementation provides
66 > * O(log(n)) time for the enqueing and dequeing methods
67 > * ({@code offer}, {@code poll}, {@code remove()} and {@code add});
68 > * linear time for the {@code remove(Object)} and {@code contains(Object)}
69 > * methods; and constant time for the retrieval methods
70 > * ({@code peek}, {@code element}, and {@code size}).
71   *
72   * <p>This class is a member of the
73 < * <a href="{@docRoot}/../guide/collections/index.html">
73 > * <a href="{@docRoot}/../technotes/guides/collections/index.html">
74   * Java Collections Framework</a>.
75 + *
76   * @since 1.5
77 < * @version %I%, %G%
59 < * @author Josh Bloch
77 > * @author Josh Bloch, Doug Lea
78   * @param <E> the type of elements held in this collection
79   */
80   public class PriorityQueue<E> extends AbstractQueue<E>
# Line 94 | Line 112 | public class PriorityQueue<E> extends Ab
112      private transient int modCount = 0;
113  
114      /**
115 <     * Creates a <tt>PriorityQueue</tt> with the default initial
115 >     * Creates a {@code PriorityQueue} with the default initial
116       * capacity (11) that orders its elements according to their
117       * {@linkplain Comparable natural ordering}.
118       */
# Line 103 | Line 121 | public class PriorityQueue<E> extends Ab
121      }
122  
123      /**
124 <     * Creates a <tt>PriorityQueue</tt> with the specified initial
124 >     * Creates a {@code PriorityQueue} with the specified initial
125       * capacity that orders its elements according to their
126       * {@linkplain Comparable natural ordering}.
127       *
128       * @param initialCapacity the initial capacity for this priority queue
129 <     * @throws IllegalArgumentException if <tt>initialCapacity</tt> is less
130 <     * than 1
129 >     * @throws IllegalArgumentException if {@code initialCapacity} is less
130 >     *         than 1
131       */
132      public PriorityQueue(int initialCapacity) {
133          this(initialCapacity, null);
134      }
135  
136      /**
137 <     * Creates a <tt>PriorityQueue</tt> with the specified initial capacity
137 >     * Creates a {@code PriorityQueue} with the specified initial capacity
138       * that orders its elements according to the specified comparator.
139       *
140       * @param  initialCapacity the initial capacity for this priority queue
141 <     * @param  comparator the comparator that will be used to order
142 <     *         this priority queue.  If <tt>null</tt>, the <i>natural
143 <     *         ordering</i> of the elements will be used.
144 <     * @throws IllegalArgumentException if <tt>initialCapacity</tt> is
141 >     * @param  comparator the comparator that will be used to order this
142 >     *         priority queue.  If {@code null}, the {@linkplain Comparable
143 >     *         natural ordering} of the elements will be used.
144 >     * @throws IllegalArgumentException if {@code initialCapacity} is
145       *         less than 1
146       */
147      public PriorityQueue(int initialCapacity,
# Line 137 | Line 155 | public class PriorityQueue<E> extends Ab
155      }
156  
157      /**
158 <     * Creates a <tt>PriorityQueue</tt> containing the elements in the
159 <     * specified collection.   If the specified collection is an
160 <     * instance of a {@link java.util.SortedSet} or is another
161 <     * <tt>PriorityQueue</tt>, the priority queue will be ordered
162 <     * according to the same ordering.  Otherwise, this priority queue
163 <     * will be ordered according to the natural ordering of its elements.
158 >     * Creates a {@code PriorityQueue} containing the elements in the
159 >     * specified collection.  If the specified collection is an instance of
160 >     * a {@link SortedSet} or is another {@code PriorityQueue}, this
161 >     * priority queue will be ordered according to the same ordering.
162 >     * Otherwise, this priority queue will be ordered according to the
163 >     * {@linkplain Comparable natural ordering} of its elements.
164       *
165       * @param  c the collection whose elements are to be placed
166       *         into this priority queue
# Line 167 | Line 185 | public class PriorityQueue<E> extends Ab
185      }
186  
187      /**
188 <     * Creates a <tt>PriorityQueue</tt> containing the elements in the
188 >     * Creates a {@code PriorityQueue} containing the elements in the
189       * specified priority queue.  This priority queue will be
190       * ordered according to the same ordering as the given priority
191       * queue.
192       *
193       * @param  c the priority queue whose elements are to be placed
194       *         into this priority queue
195 <     * @throws ClassCastException if elements of <tt>c</tt> cannot be
196 <     *         compared to one another according to <tt>c</tt>'s
195 >     * @throws ClassCastException if elements of {@code c} cannot be
196 >     *         compared to one another according to {@code c}'s
197       *         ordering
198       * @throws NullPointerException if the specified priority queue or any
199       *         of its elements are null
# Line 186 | Line 204 | public class PriorityQueue<E> extends Ab
204      }
205  
206      /**
207 <     * Creates a <tt>PriorityQueue</tt> containing the elements in the
208 <     * specified sorted set.  This priority queue will be ordered
207 >     * Creates a {@code PriorityQueue} containing the elements in the
208 >     * specified sorted set.   This priority queue will be ordered
209       * according to the same ordering as the given sorted set.
210       *
211       * @param  c the sorted set whose elements are to be placed
212 <     *         into this priority queue.
212 >     *         into this priority queue
213       * @throws ClassCastException if elements of the specified sorted
214       *         set cannot be compared to one another according to the
215       *         sorted set's ordering
# Line 204 | Line 222 | public class PriorityQueue<E> extends Ab
222      }
223  
224      /**
225 <     * Initialize queue array with elements from the given Collection.
225 >     * Initializes queue array with elements from the given Collection.
226 >     *
227       * @param c the collection
228       */
229      private void initFromCollection(Collection<? extends E> c) {
# Line 224 | Line 243 | public class PriorityQueue<E> extends Ab
243      private void grow(int minCapacity) {
244          if (minCapacity < 0) // overflow
245              throw new OutOfMemoryError();
246 <        int oldCapacity = queue.length;
246 >        int oldCapacity = queue.length;
247          // Double size if small; else grow by 50%
248          int newCapacity = ((oldCapacity < 64)?
249                             ((oldCapacity + 1) * 2):
# Line 239 | Line 258 | public class PriorityQueue<E> extends Ab
258      /**
259       * Inserts the specified element into this priority queue.
260       *
261 <     * @return <tt>true</tt> (as specified by {@link Collection#add})
261 >     * @return {@code true} (as specified by {@link Collection#add})
262       * @throws ClassCastException if the specified element cannot be
263       *         compared with elements currently in this priority queue
264       *         according to the priority queue's ordering
# Line 252 | Line 271 | public class PriorityQueue<E> extends Ab
271      /**
272       * Inserts the specified element into this priority queue.
273       *
274 <     * @return <tt>true</tt> (as specified by {@link Queue#offer})
274 >     * @return {@code true} (as specified by {@link Queue#offer})
275       * @throws ClassCastException if the specified element cannot be
276       *         compared with elements currently in this priority queue
277       *         according to the priority queue's ordering
# Line 280 | Line 299 | public class PriorityQueue<E> extends Ab
299      }
300  
301      private int indexOf(Object o) {
302 <        if (o != null) {
302 >        if (o != null) {
303              for (int i = 0; i < size; i++)
304                  if (o.equals(queue[i]))
305                      return i;
# Line 290 | Line 309 | public class PriorityQueue<E> extends Ab
309  
310      /**
311       * Removes a single instance of the specified element from this queue,
312 <     * if it is present.  More formally, removes an element <tt>e</tt> such
313 <     * that <tt>o.equals(e)</tt>, if this queue contains one or more such
314 <     * elements.  Returns true if this queue contained the specified element
315 <     * (or equivalently, if this queue changed as a result of the call).
312 >     * if it is present.  More formally, removes an element {@code e} such
313 >     * that {@code o.equals(e)}, if this queue contains one or more such
314 >     * elements.  Returns {@code true} if and only if this queue contained
315 >     * the specified element (or equivalently, if this queue changed as a
316 >     * result of the call).
317       *
318       * @param o element to be removed from this queue, if present
319 <     * @return <tt>true</tt> if this queue changed as a result of the call
319 >     * @return {@code true} if this queue changed as a result of the call
320       */
321      public boolean remove(Object o) {
322 <        int i = indexOf(o);
323 <        if (i == -1)
324 <            return false;
325 <        else {
326 <            removeAt(i);
327 <            return true;
328 <        }
322 >        int i = indexOf(o);
323 >        if (i == -1)
324 >            return false;
325 >        else {
326 >            removeAt(i);
327 >            return true;
328 >        }
329      }
330  
331      /**
# Line 313 | Line 333 | public class PriorityQueue<E> extends Ab
333       * Needed by iterator.remove.
334       *
335       * @param o element to be removed from this queue, if present
336 <     * @return <tt>true</tt> if removed
336 >     * @return {@code true} if removed
337       */
338      boolean removeEq(Object o) {
339 <        for (int i = 0; i < size; i++) {
340 <            if (o == queue[i]) {
339 >        for (int i = 0; i < size; i++) {
340 >            if (o == queue[i]) {
341                  removeAt(i);
342                  return true;
343              }
# Line 326 | Line 346 | public class PriorityQueue<E> extends Ab
346      }
347  
348      /**
349 <     * Returns <tt>true</tt> if this queue contains the specified element.
350 <     * More formally, returns <tt>true</tt> if and only if this queue contains
351 <     * at least one element <tt>e</tt> such that <tt>o.equals(e)</tt>.
349 >     * Returns {@code true} if this queue contains the specified element.
350 >     * More formally, returns {@code true} if and only if this queue contains
351 >     * at least one element {@code e} such that {@code o.equals(e)}.
352       *
353       * @param o object to be checked for containment in this queue
354 <     * @return <tt>true</tt> if this queue contains the specified element
354 >     * @return {@code true} if this queue contains the specified element
355       */
356      public boolean contains(Object o) {
357 <        return indexOf(o) != -1;
357 >        return indexOf(o) != -1;
358      }
359  
360      /**
361 <     * Returns an array containing all of the elements in this queue,
361 >     * Returns an array containing all of the elements in this queue.
362       * The elements are in no particular order.
363       *
364       * <p>The returned array will be "safe" in that no references to it are
365 <     * maintained by this list.  (In other words, this method must allocate
365 >     * maintained by this queue.  (In other words, this method must allocate
366       * a new array).  The caller is thus free to modify the returned array.
367       *
368 +     * <p>This method acts as bridge between array-based and collection-based
369 +     * APIs.
370 +     *
371       * @return an array containing all of the elements in this queue
372       */
373      public Object[] toArray() {
# Line 352 | Line 375 | public class PriorityQueue<E> extends Ab
375      }
376  
377      /**
378 <     * Returns an array containing all of the elements in this queue.
379 <     * The elements are in no particular order.  The runtime type of
380 <     * the returned array is that of the specified array.  If the queue
381 <     * fits in the specified array, it is returned therein.
382 <     * Otherwise, a new array is allocated with the runtime type of
383 <     * the specified array and the size of this queue.
378 >     * Returns an array containing all of the elements in this queue; the
379 >     * runtime type of the returned array is that of the specified array.
380 >     * The returned array elements are in no particular order.
381 >     * If the queue fits in the specified array, it is returned therein.
382 >     * Otherwise, a new array is allocated with the runtime type of the
383 >     * specified array and the size of this queue.
384       *
385       * <p>If the queue fits in the specified array with room to spare
386       * (i.e., the array has more elements than the queue), the element in
387       * the array immediately following the end of the collection is set to
388 <     * <tt>null</tt>.  (This is useful in determining the length of the
389 <     * queue <i>only</i> if the caller knows that the queue does not contain
390 <     * any null elements.)
388 >     * {@code null}.
389 >     *
390 >     * <p>Like the {@link #toArray()} method, this method acts as bridge between
391 >     * array-based and collection-based APIs.  Further, this method allows
392 >     * precise control over the runtime type of the output array, and may,
393 >     * under certain circumstances, be used to save allocation costs.
394 >     *
395 >     * <p>Suppose <tt>x</tt> is a queue known to contain only strings.
396 >     * The following code can be used to dump the queue into a newly
397 >     * allocated array of <tt>String</tt>:
398 >     *
399 >     * <pre>
400 >     *     String[] y = x.toArray(new String[0]);</pre>
401 >     *
402 >     * Note that <tt>toArray(new Object[0])</tt> is identical in function to
403 >     * <tt>toArray()</tt>.
404       *
405       * @param a the array into which the elements of the queue are to
406       *          be stored, if it is big enough; otherwise, a new array of the
407       *          same runtime type is allocated for this purpose.
408 <     * @return an array containing the elements of the queue
408 >     * @return an array containing all of the elements in this queue
409       * @throws ArrayStoreException if the runtime type of the specified array
410       *         is not a supertype of the runtime type of every element in
411       *         this queue
# Line 379 | Line 415 | public class PriorityQueue<E> extends Ab
415          if (a.length < size)
416              // Make a new array of a's runtime type, but my contents:
417              return (T[]) Arrays.copyOf(queue, size, a.getClass());
418 <        System.arraycopy(queue, 0, a, 0, size);
418 >        System.arraycopy(queue, 0, a, 0, size);
419          if (a.length > size)
420              a[size] = null;
421          return a;
# Line 418 | Line 454 | public class PriorityQueue<E> extends Ab
454           * after we've completed the "normal" iteration.
455           *
456           * We expect that most iterations, even those involving removals,
457 <         * will not use need to store elements in this field.
457 >         * will not need to store elements in this field.
458           */
459          private ArrayDeque<E> forgetMeNot = null;
460  
# Line 430 | Line 466 | public class PriorityQueue<E> extends Ab
466  
467          /**
468           * The modCount value that the iterator believes that the backing
469 <         * List should have.  If this expectation is violated, the iterator
469 >         * Queue should have.  If this expectation is violated, the iterator
470           * has detected concurrent modification.
471           */
472          private int expectedModCount = modCount;
# Line 457 | Line 493 | public class PriorityQueue<E> extends Ab
493          public void remove() {
494              if (expectedModCount != modCount)
495                  throw new ConcurrentModificationException();
460            if (lastRet == -1 && lastRetElt == null)
461                throw new IllegalStateException();
496              if (lastRet != -1) {
497                  E moved = PriorityQueue.this.removeAt(lastRet);
498                  lastRet = -1;
# Line 469 | Line 503 | public class PriorityQueue<E> extends Ab
503                          forgetMeNot = new ArrayDeque<E>();
504                      forgetMeNot.add(moved);
505                  }
506 <            } else {
506 >            } else if (lastRetElt != null) {
507                  PriorityQueue.this.removeEq(lastRetElt);
508                  lastRetElt = null;
509 +            } else {
510 +                throw new IllegalStateException();
511              }
512              expectedModCount = modCount;
513          }
478
514      }
515  
516      public int size() {
# Line 498 | Line 533 | public class PriorityQueue<E> extends Ab
533              return null;
534          int s = --size;
535          modCount++;
536 <        E result = (E)queue[0];
537 <        E x = (E)queue[s];
536 >        E result = (E) queue[0];
537 >        E x = (E) queue[s];
538          queue[s] = null;
539          if (s != 0)
540              siftDown(0, x);
# Line 516 | Line 551 | public class PriorityQueue<E> extends Ab
551       * i.  Under these circumstances, this method returns the element
552       * that was previously at the end of the list and is now at some
553       * position before i. This fact is used by iterator.remove so as to
554 <     * avoid missing traverseing elements.
554 >     * avoid missing traversing elements.
555       */
556      private E removeAt(int i) {
557          assert i >= 0 && i < size;
# Line 561 | Line 596 | public class PriorityQueue<E> extends Ab
596          while (k > 0) {
597              int parent = (k - 1) >>> 1;
598              Object e = queue[parent];
599 <            if (key.compareTo((E)e) >= 0)
599 >            if (key.compareTo((E) e) >= 0)
600                  break;
601              queue[k] = e;
602              k = parent;
# Line 573 | Line 608 | public class PriorityQueue<E> extends Ab
608          while (k > 0) {
609              int parent = (k - 1) >>> 1;
610              Object e = queue[parent];
611 <            if (comparator.compare(x, (E)e) >= 0)
611 >            if (comparator.compare(x, (E) e) >= 0)
612                  break;
613              queue[k] = e;
614              k = parent;
# Line 604 | Line 639 | public class PriorityQueue<E> extends Ab
639              Object c = queue[child];
640              int right = child + 1;
641              if (right < size &&
642 <                ((Comparable<? super E>)c).compareTo((E)queue[right]) > 0)
642 >                ((Comparable<? super E>) c).compareTo((E) queue[right]) > 0)
643                  c = queue[child = right];
644 <            if (key.compareTo((E)c) <= 0)
644 >            if (key.compareTo((E) c) <= 0)
645                  break;
646              queue[k] = c;
647              k = child;
# Line 621 | Line 656 | public class PriorityQueue<E> extends Ab
656              Object c = queue[child];
657              int right = child + 1;
658              if (right < size &&
659 <                comparator.compare((E)c, (E)queue[right]) > 0)
659 >                comparator.compare((E) c, (E) queue[right]) > 0)
660                  c = queue[child = right];
661 <            if (comparator.compare(x, (E)c) <= 0)
661 >            if (comparator.compare(x, (E) c) <= 0)
662                  break;
663              queue[k] = c;
664              k = child;
# Line 637 | Line 672 | public class PriorityQueue<E> extends Ab
672       */
673      private void heapify() {
674          for (int i = (size >>> 1) - 1; i >= 0; i--)
675 <            siftDown(i, (E)queue[i]);
675 >            siftDown(i, (E) queue[i]);
676      }
677  
678      /**
679       * Returns the comparator used to order the elements in this
680 <     * queue, or <tt>null</tt> if this queue is sorted according to
680 >     * queue, or {@code null} if this queue is sorted according to
681       * the {@linkplain Comparable natural ordering} of its elements.
682       *
683       * @return the comparator used to order this queue, or
684 <     *         <tt>null</tt> if this queue is sorted according to the
685 <     *         natural ordering of its elements.
684 >     *         {@code null} if this queue is sorted according to the
685 >     *         natural ordering of its elements
686       */
687      public Comparator<? super E> comparator() {
688          return comparator;
689      }
690  
691      /**
692 <     * Save the state of the instance to a stream (that
693 <     * is, serialize it).
692 >     * Saves the state of the instance to a stream (that
693 >     * is, serializes it).
694       *
695       * @serialData The length of the array backing the instance is
696 <     * emitted (int), followed by all of its elements (each an
697 <     * <tt>Object</tt>) in the proper order.
696 >     *             emitted (int), followed by all of its elements
697 >     *             (each an {@code Object}) in the proper order.
698       * @param s the stream
699       */
700      private void writeObject(java.io.ObjectOutputStream s)
# Line 667 | Line 702 | public class PriorityQueue<E> extends Ab
702          // Write out element count, and any hidden stuff
703          s.defaultWriteObject();
704  
705 <        // Write out array length
706 <        // For compatibility with 1.5 version, must be at least 2.
672 <        s.writeInt(Math.max(2, queue.length));
705 >        // Write out array length, for compatibility with 1.5 version
706 >        s.writeInt(Math.max(2, size + 1));
707  
708 <        // Write out all elements in the proper order.
709 <        for (int i=0; i<size; i++)
708 >        // Write out all elements in the "proper order".
709 >        for (int i = 0; i < size; i++)
710              s.writeObject(queue[i]);
711      }
712  
713      /**
714 <     * Reconstitute the <tt>PriorityQueue</tt> instance from a stream
715 <     * (that is, deserialize it).
714 >     * Reconstitutes the {@code PriorityQueue} instance from a stream
715 >     * (that is, deserializes it).
716 >     *
717       * @param s the stream
718       */
719      private void readObject(java.io.ObjectInputStream s)
# Line 686 | Line 721 | public class PriorityQueue<E> extends Ab
721          // Read in size, and any hidden stuff
722          s.defaultReadObject();
723  
724 <        // Read in array length and allocate array
725 <        int arrayLength = s.readInt();
726 <        queue = new Object[arrayLength];
727 <
693 <        // Read in all elements in the proper order.
694 <        for (int i=0; i<size; i++)
695 <            queue[i] = (E) s.readObject();
696 <    }
724 >        // Read in (and discard) array length
725 >        s.readInt();
726 >
727 >        queue = new Object[size];
728  
729 +        // Read in all elements.
730 +        for (int i = 0; i < size; i++)
731 +            queue[i] = s.readObject();
732 +
733 +        // Elements are guaranteed to be in "proper order", but the
734 +        // spec has never explained what that might be.
735 +        heapify();
736 +    }
737   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines