ViewVC Help

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

root/jsr166/jsr166/src/main/java/util/concurrent/PriorityBlockingQueue.java

Comparing jsr166/src/main/java/util/concurrent/PriorityBlockingQueue.java (file contents):
Revision 1.18 by tim, Wed Aug 6 18:22:09 2003 UTC vs.
Revision 1.19 by tim, Fri Aug 8 20:05:07 2003 UTC

#	Line 154 | Line 154 | public class PriorityBlockingQueue<E> ex
154		assert ok;
155		notEmpty.signal();
156		return true;
157	<	}
158	<	finally {
157	>	} finally {
158		lock.unlock();
159		}
160		}
#	Line 194 | Line 193 | public class PriorityBlockingQueue<E> ex
193		try {
194		while (q.size() == 0)
195		notEmpty.await();
196	<	}
198	<	catch (InterruptedException ie) {
196	>	} catch (InterruptedException ie) {
197		notEmpty.signal(); // propagate to non-interrupted thread
198		throw ie;
199		}
200		E x = q.poll();
201		assert x != null;
202		return x;
203	<	}
206	<	finally {
203	>	} finally {
204		lock.unlock();
205		}
206		}
#	Line 213 | Line 210 | public class PriorityBlockingQueue<E> ex
210		lock.lock();
211		try {
212		return q.poll();
213	<	}
217	<	finally {
213	>	} finally {
214		lock.unlock();
215		}
216		}
#	Line 231 | Line 227 | public class PriorityBlockingQueue<E> ex
227		return null;
228		try {
229		nanos = notEmpty.awaitNanos(nanos);
230	<	}
235	<	catch (InterruptedException ie) {
230	>	} catch (InterruptedException ie) {
231		notEmpty.signal(); // propagate to non-interrupted thread
232		throw ie;
233		}
234		}
235	<	}
241	<	finally {
235	>	} finally {
236		lock.unlock();
237		}
238		}
#	Line 247 | Line 241 | public class PriorityBlockingQueue<E> ex
241		lock.lock();
242		try {
243		return q.peek();
244	<	}
251	<	finally {
244	>	} finally {
245		lock.unlock();
246		}
247		}
#	Line 257 | Line 250 | public class PriorityBlockingQueue<E> ex
250		lock.lock();
251		try {
252		return q.size();
253	<	}
261	<	finally {
253	>	} finally {
254		lock.unlock();
255		}
256		}
#	Line 290 | Line 282 | public class PriorityBlockingQueue<E> ex
282		lock.lock();
283		try {
284		return q.remove(o);
285	<	}
294	<	finally {
285	>	} finally {
286		lock.unlock();
287		}
288		}
#	Line 300 | Line 291 | public class PriorityBlockingQueue<E> ex
291		lock.lock();
292		try {
293		return q.contains(o);
294	<	}
304	<	finally {
294	>	} finally {
295		lock.unlock();
296		}
297		}
#	Line 310 | Line 300 | public class PriorityBlockingQueue<E> ex
300		lock.lock();
301		try {
302		return q.toArray();
303	<	}
314	<	finally {
303	>	} finally {
304		lock.unlock();
305		}
306		}
#	Line 321 | Line 310 | public class PriorityBlockingQueue<E> ex
310		lock.lock();
311		try {
312		return q.toString();
313	<	}
325	<	finally {
313	>	} finally {
314		lock.unlock();
315		}
316		}
#	Line 335 | Line 323 | public class PriorityBlockingQueue<E> ex
323		lock.lock();
324		try {
325		q.clear();
326	<	}
339	<	finally {
326	>	} finally {
327		lock.unlock();
328		}
329		}
#	Line 345 | Line 332 | public class PriorityBlockingQueue<E> ex
332		lock.lock();
333		try {
334		return q.toArray(a);
335	<	}
349	<	finally {
335	>	} finally {
336		lock.unlock();
337		}
338		}
#	Line 365 | Line 351 | public class PriorityBlockingQueue<E> ex
351		lock.lock();
352		try {
353		return new Itr(q.iterator());
354	<	}
369	<	finally {
354	>	} finally {
355		lock.unlock();
356		}
357		}
#	Line 391 | Line 376 | public class PriorityBlockingQueue<E> ex
376		lock.lock();
377		try {
378		return iter.next();
379	<	}
395	<	finally {
379	>	} finally {
380		lock.unlock();
381		}
382		}
#	Line 401 | Line 385 | public class PriorityBlockingQueue<E> ex
385		lock.lock();
386		try {
387		iter.remove();
388	<	}
405	<	finally {
388	>	} finally {
389		lock.unlock();
390		}
391		}
#	Line 420 | Line 403 | public class PriorityBlockingQueue<E> ex
403		lock.lock();
404		try {
405		s.defaultWriteObject();
406	<	}
424	<	finally {
406	>	} finally {
407		lock.unlock();
408		}
409		}

Diff Legend

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