src/java.base/share/classes/java/util/concurrent/AbstractExecutorService.java
changeset 48541 946e34c2dec9
parent 47216 71c04702a3d5
--- a/src/java.base/share/classes/java/util/concurrent/AbstractExecutorService.java	Tue Jan 16 18:24:32 2018 -0800
+++ b/src/java.base/share/classes/java/util/concurrent/AbstractExecutorService.java	Tue Jan 16 18:28:39 2018 -0800
@@ -245,8 +245,7 @@
                 Future<T> f = futures.get(i);
                 if (!f.isDone()) {
                     try { f.get(); }
-                    catch (CancellationException ignore) {}
-                    catch (ExecutionException ignore) {}
+                    catch (CancellationException | ExecutionException ignore) {}
                 }
             }
             return futures;
@@ -283,8 +282,7 @@
                 Future<T> f = futures.get(j);
                 if (!f.isDone()) {
                     try { f.get(deadline - System.nanoTime(), NANOSECONDS); }
-                    catch (CancellationException ignore) {}
-                    catch (ExecutionException ignore) {}
+                    catch (CancellationException | ExecutionException ignore) {}
                     catch (TimeoutException timedOut) {
                         break timedOut;
                     }