ViewVC Help

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

root/jsr166/jsr166/src/jsr166e/ForkJoinPool.java

Comparing jsr166/src/jsr166e/ForkJoinPool.java (file contents):
Revision 1.19 by jsr166, Tue Nov 20 05:18:42 2012 UTC vs.
Revision 1.20 by jsr166, Tue Nov 20 06:18:39 2012 UTC

#	Line 103 | Line 103 | import java.util.concurrent.TimeUnit;
103		* java.util.concurrent.ForkJoinPool.common}: {@code parallelism} --
104		* an integer greater than zero, {@code threadFactory} -- the class
105		* name of a {@link ForkJoinWorkerThreadFactory}, and {@code
106	–	<<<<<<< ForkJoinPool.java
107	–	* exceptionHandler} -- the class name of a {@code
108	–	=======
106		* exceptionHandler} -- the class name of a {@link
107		* java.lang.Thread.UncaughtExceptionHandler
111	–	>>>>>>> 1.111
108		* Thread.UncaughtExceptionHandler}. Upon any error in establishing
109		* these settings, default parameters are used.
110		*

Diff Legend

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