ViewVC Help

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

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

Comparing jsr166/src/main/java/util/concurrent/ThreadPoolExecutor.java (file contents):
Revision 1.152 by dl, Wed May 7 10:32:51 2014 UTC vs.
Revision 1.153 by jsr166, Sun May 25 02:33:45 2014 UTC

#	Line 433 | Line 433 | public class ThreadPoolExecutor extends
433		* Set containing all worker threads in pool. Accessed only when
434		* holding mainLock.
435		*/
436	<	private final HashSet<Worker> workers = new HashSet<Worker>();
436	>	private final HashSet<Worker> workers = new HashSet<>();
437
438		/**
439		* Wait condition to support awaitTermination
#	Line 821 | Line 821 | public class ThreadPoolExecutor extends
821		*/
822		private List<Runnable> drainQueue() {
823		BlockingQueue<Runnable> q = workQueue;
824	<	ArrayList<Runnable> taskList = new ArrayList<Runnable>();
824	>	ArrayList<Runnable> taskList = new ArrayList<>();
825		q.drainTo(taskList);
826		if (!q.isEmpty()) {
827		for (Runnable r : q.toArray(new Runnable[0])) {

Diff Legend

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