51 |
|
exInfo = CancellationException.class; |
52 |
|
} catch (ExecutionException t) { |
53 |
|
exInfo = t.getCause(); |
54 |
< |
} catch (Exception t) { |
54 |
> |
} catch (Throwable t) { |
55 |
|
threadUnexpectedException(t); |
56 |
|
} |
57 |
|
|
66 |
|
assertSame(exInfo, CancellationException.class); |
67 |
|
} catch (ExecutionException t) { |
68 |
|
assertSame(exInfo, t.getCause()); |
69 |
< |
} catch (Exception t) { |
69 |
> |
} catch (Throwable t) { |
70 |
|
threadUnexpectedException(t); |
71 |
|
} |
72 |
|
assertTrue(f.isDone()); |
108 |
|
try { |
109 |
|
assertSame(expected, f.get()); |
110 |
|
assertSame(expected, f.get(randomTimeout(), randomTimeUnit())); |
111 |
< |
} catch (Exception fail) { threadUnexpectedException(fail); } |
111 |
> |
} catch (Throwable fail) { threadUnexpectedException(fail); } |
112 |
|
} |
113 |
|
|
114 |
|
void checkCancelled(Future<?> f) { |