ViewVC Help

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

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

Comparing jsr166/src/main/java/util/concurrent/AbstractExecutorService.java (file contents):
Revision 1.18 by dl, Mon Feb 9 13:28:47 2004 UTC vs.
Revision 1.19 by jsr166, Mon May 2 08:40:27 2005 UTC

#	Line 103 | Line 103 | public abstract class AbstractExecutorSe
103		--active;
104		try {
105		return f.get();
106	<	} catch(InterruptedException ie) {
106	>	} catch (InterruptedException ie) {
107		throw ie;
108	<	} catch(ExecutionException eex) {
108	>	} catch (ExecutionException eex) {
109		ee = eex;
110	<	} catch(RuntimeException rex) {
110	>	} catch (RuntimeException rex) {
111		ee = new ExecutionException(rex);
112		}
113		}
#	Line 155 | Line 155 | public abstract class AbstractExecutorSe
155		if (!f.isDone()) {
156		try {
157		f.get();
158	<	} catch(CancellationException ignore) {
159	<	} catch(ExecutionException ignore) {
158	>	} catch (CancellationException ignore) {
159	>	} catch (ExecutionException ignore) {
160		}
161		}
162		}
#	Line 201 | Line 201 | public abstract class AbstractExecutorSe
201		return futures;
202		try {
203		f.get(nanos, TimeUnit.NANOSECONDS);
204	<	} catch(CancellationException ignore) {
205	<	} catch(ExecutionException ignore) {
206	<	} catch(TimeoutException toe) {
204	>	} catch (CancellationException ignore) {
205	>	} catch (ExecutionException ignore) {
206	>	} catch (TimeoutException toe) {
207		return futures;
208		}
209		long now = System.nanoTime();

Diff Legend

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