ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/main/java/util/PriorityQueue.java

Comparing jsr166/src/main/java/util/PriorityQueue.java (file contents):
Revision 1.132 by jsr166, Fri Aug 30 18:05:39 2019 UTC vs.
Revision 1.134 by jsr166, Fri Jul 24 20:57:26 2020 UTC

#	Line 111 | Line 111 | public class PriorityQueue<E> extends Ab
111		* The comparator, or null if priority queue uses elements'
112		* natural ordering.
113		*/
114	+	@SuppressWarnings("serial") // Conditionally serializable
115		private final Comparator<? super E> comparator;
116
117		/**
#	Line 262 | Line 263 | public class PriorityQueue<E> extends Ab
263		private void initElementsFromCollection(Collection<? extends E> c) {
264		Object[] es = c.toArray();
265		int len = es.length;
266	<	// If c.toArray incorrectly doesn't return Object[], copy it.
266	<	if (es.getClass() != Object[].class)
266	>	if (c.getClass() != ArrayList.class)
267		es = Arrays.copyOf(es, len, Object[].class);
268		if (len == 1 || this.comparator != null)
269		for (Object e : es)

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines