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.153 by jsr166, Sun May 25 02:33:45 2014 UTC vs.
Revision 1.154 by jsr166, Thu Sep 11 16:15:57 2014 UTC

#	Line 1949 | Line 1949 | public class ThreadPoolExecutor extends
1949		*       try {
1950		*         Object result = ((Future<?>) r).get();
1951		*       } catch (CancellationException ce) {
1952	<	*           t = ce;
1952	>	*         t = ce;
1953		*       } catch (ExecutionException ee) {
1954	<	*           t = ee.getCause();
1954	>	*         t = ee.getCause();
1955		*       } catch (InterruptedException ie) {
1956	<	*           Thread.currentThread().interrupt(); // ignore/reset
1956	>	*         Thread.currentThread().interrupt(); // ignore/reset
1957		*       }
1958		*     }
1959		*     if (t != null)

Diff Legend

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