diff --git a/src/java.base/share/classes/java/net/InetAddress.java b/src/java.base/share/classes/java/net/InetAddress.java index fcc2e2700269..79c48e7f10c2 100644 --- a/src/java.base/share/classes/java/net/InetAddress.java +++ b/src/java.base/share/classes/java/net/InetAddress.java @@ -1068,7 +1068,6 @@ public InetAddress[] get() { inetAddresses = getAddressesFromNameService(host); // don't update the "expirySet", will do that later staleTime = refreshTime + InetAddressCachePolicy.getStale() * 1000_000_000L; - } catch (UnknownHostException ignore) { } finally { lookupLock.unlock(); } diff --git a/src/java.base/share/classes/java/util/concurrent/ThreadPoolExecutor.java b/src/java.base/share/classes/java/util/concurrent/ThreadPoolExecutor.java index 7e324263e085..bb0cd74b1511 100644 --- a/src/java.base/share/classes/java/util/concurrent/ThreadPoolExecutor.java +++ b/src/java.base/share/classes/java/util/concurrent/ThreadPoolExecutor.java @@ -805,7 +805,6 @@ private void interruptIdleWorkers(boolean onlyOne) { if (!t.isInterrupted() && w.tryLock()) { try { t.interrupt(); - } catch (SecurityException ignore) { } finally { w.unlock(); } diff --git a/src/java.base/share/classes/sun/net/www/http/HttpCapture.java b/src/java.base/share/classes/sun/net/www/http/HttpCapture.java index 1d2732e0473a..23119f0c42e3 100644 --- a/src/java.base/share/classes/sun/net/www/http/HttpCapture.java +++ b/src/java.base/share/classes/sun/net/www/http/HttpCapture.java @@ -97,8 +97,6 @@ public String run() { } line = in.readLine(); } - } catch (IOException ioe) { - } finally { try { in.close(); diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java index e2b3b3537ac0..0d553b0c617a 100644 --- a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java +++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java @@ -415,7 +415,6 @@ private void skipPastImage(int imageIndex) { try { gotoImage(imageIndex); skipImage(); - } catch (IOException | IndexOutOfBoundsException e) { } finally { cbLock.unlock(); } diff --git a/src/java.desktop/share/classes/com/sun/imageio/stream/CloseableDisposerRecord.java b/src/java.desktop/share/classes/com/sun/imageio/stream/CloseableDisposerRecord.java index 5ea52def6576..05836056855d 100644 --- a/src/java.desktop/share/classes/com/sun/imageio/stream/CloseableDisposerRecord.java +++ b/src/java.desktop/share/classes/com/sun/imageio/stream/CloseableDisposerRecord.java @@ -45,7 +45,6 @@ public synchronized void dispose() { if (closeable != null) { try { closeable.close(); - } catch (IOException e) { } finally { closeable = null; } diff --git a/src/java.desktop/share/classes/com/sun/imageio/stream/StreamFinalizer.java b/src/java.desktop/share/classes/com/sun/imageio/stream/StreamFinalizer.java index 012d7e106459..760e9414f5d8 100644 --- a/src/java.desktop/share/classes/com/sun/imageio/stream/StreamFinalizer.java +++ b/src/java.desktop/share/classes/com/sun/imageio/stream/StreamFinalizer.java @@ -64,7 +64,6 @@ public StreamFinalizer(ImageInputStream stream) { protected void finalize() throws Throwable { try { stream.close(); - } catch (IOException e) { } finally { stream = null; super.finalize(); diff --git a/src/java.desktop/share/classes/javax/imageio/stream/FileCacheImageInputStream.java b/src/java.desktop/share/classes/javax/imageio/stream/FileCacheImageInputStream.java index d5c1ff18e5a6..48c813ebe5c9 100644 --- a/src/java.desktop/share/classes/javax/imageio/stream/FileCacheImageInputStream.java +++ b/src/java.desktop/share/classes/javax/imageio/stream/FileCacheImageInputStream.java @@ -286,7 +286,6 @@ public synchronized void dispose() { if (cache != null) { try { cache.close(); - } catch (IOException e) { } finally { cache = null; } diff --git a/src/java.desktop/share/classes/javax/swing/TimerQueue.java b/src/java.desktop/share/classes/javax/swing/TimerQueue.java index 2743baefae66..e80f9b1b0f78 100644 --- a/src/java.desktop/share/classes/javax/swing/TimerQueue.java +++ b/src/java.desktop/share/classes/javax/swing/TimerQueue.java @@ -186,7 +186,6 @@ public void run() { // Allow run other threads on systems without kernel threads timer.getLock().newCondition().awaitNanos(1); - } catch (SecurityException ignore) { } finally { timer.getLock().unlock(); } diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java index c105a74cfcbf..97e379ea0950 100644 --- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java +++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java @@ -1256,7 +1256,6 @@ public void damageRange(JTextComponent t, int p0, int p1, Rectangle rect = (toDamage instanceof Rectangle) ? (Rectangle)toDamage : toDamage.getBounds(); editor.repaint(rect.x, rect.y, rect.width, rect.height); - } catch (BadLocationException e) { } finally { if (doc instanceof AbstractDocument) { ((AbstractDocument)doc).readUnlock(); diff --git a/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java b/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java index c5e9dbd94df8..050baec975d5 100644 --- a/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java +++ b/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java @@ -2844,7 +2844,6 @@ public Rectangle getCharacterBounds(int i) { (Rectangle)bounds : bounds.getBounds(); } - } catch (BadLocationException e) { } finally { if (model instanceof AbstractDocument) { ((AbstractDocument)model).readUnlock(); @@ -3042,7 +3041,6 @@ private String getAtIndex(int part, int index, int direction) { default: break; } - } catch (BadLocationException e) { } finally { if (model instanceof AbstractDocument) { ((AbstractDocument)model).readUnlock(); @@ -3365,9 +3363,6 @@ private AccessibleTextSequence getSequenceAtIndex(int part, model.getText(index + direction, 1)); } - } catch (BadLocationException e) { - // we are intentionally silent; our contract says we return - // null if there is any failure in this method } finally { if (model instanceof AbstractDocument) { ((AbstractDocument)model).readUnlock(); @@ -3725,7 +3720,6 @@ public Rectangle getTextBounds(int startIndex, int endIndex) { (Rectangle)bounds : bounds.getBounds(); } - } catch (BadLocationException e) { } finally { if (model instanceof AbstractDocument) { ((AbstractDocument)model).readUnlock(); diff --git a/src/java.desktop/share/classes/javax/swing/text/html/AccessibleHTML.java b/src/java.desktop/share/classes/javax/swing/text/html/AccessibleHTML.java index db09ab17d243..2114fad45675 100644 --- a/src/java.desktop/share/classes/javax/swing/text/html/AccessibleHTML.java +++ b/src/java.desktop/share/classes/javax/swing/text/html/AccessibleHTML.java @@ -1061,7 +1061,6 @@ private String getAtIndex(int part, int index, int direction) { default: break; } - } catch (BadLocationException e) { } finally { if (model instanceof AbstractDocument) { ((AbstractDocument)model).readUnlock(); diff --git a/src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java b/src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java index 61463eb431fb..764c320a4fad 100644 --- a/src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java +++ b/src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java @@ -2697,10 +2697,7 @@ private void adjustEndElement() { this, event)); } } - } - catch (BadLocationException ble) { - } - finally { + } finally { releaseLock(); } } diff --git a/src/java.desktop/share/classes/sun/awt/datatransfer/SunClipboard.java b/src/java.desktop/share/classes/sun/awt/datatransfer/SunClipboard.java index 898cabd28558..8c5bcc6937dd 100644 --- a/src/java.desktop/share/classes/sun/awt/datatransfer/SunClipboard.java +++ b/src/java.desktop/share/classes/sun/awt/datatransfer/SunClipboard.java @@ -360,7 +360,6 @@ public synchronized void addFlavorListener(FlavorListener listener) { try { openClipboard(null); currentFormats = getClipboardFormats(); - } catch (final IllegalStateException ignored) { } finally { closeClipboard(); } diff --git a/src/java.desktop/share/classes/sun/font/TrueTypeFont.java b/src/java.desktop/share/classes/sun/font/TrueTypeFont.java index 3895ec6ca826..7e3b16a159ba 100644 --- a/src/java.desktop/share/classes/sun/font/TrueTypeFont.java +++ b/src/java.desktop/share/classes/sun/font/TrueTypeFont.java @@ -138,7 +138,6 @@ public synchronized void dispose() { if (channel != null) { channel.close(); } - } catch (IOException e) { } finally { channel = null; } diff --git a/src/java.desktop/share/classes/sun/print/PSStreamPrintJob.java b/src/java.desktop/share/classes/sun/print/PSStreamPrintJob.java index 3a75a3232b51..b6f252db54dc 100644 --- a/src/java.desktop/share/classes/sun/print/PSStreamPrintJob.java +++ b/src/java.desktop/share/classes/sun/print/PSStreamPrintJob.java @@ -156,7 +156,6 @@ private void closeDataStreams() { if (instream != null) { try { instream.close(); - } catch (IOException e) { } finally { instream = null; } @@ -164,7 +163,6 @@ private void closeDataStreams() { else if (reader != null) { try { reader.close(); - } catch (IOException e) { } finally { reader = null; } diff --git a/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java b/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java index 913c69e40eef..a9324613660a 100644 --- a/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java +++ b/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java @@ -197,7 +197,6 @@ private void closeDataStreams() { if (instream != null) { try { instream.close(); - } catch (IOException e) { } finally { instream = null; } @@ -205,7 +204,6 @@ private void closeDataStreams() { else if (reader != null) { try { reader.close(); - } catch (IOException e) { } finally { reader = null; } diff --git a/src/java.desktop/windows/classes/sun/print/Win32PrintJob.java b/src/java.desktop/windows/classes/sun/print/Win32PrintJob.java index 53fe183e8610..9d968a07fa4c 100644 --- a/src/java.desktop/windows/classes/sun/print/Win32PrintJob.java +++ b/src/java.desktop/windows/classes/sun/print/Win32PrintJob.java @@ -177,7 +177,6 @@ private void closeDataStreams() { if (instream != null) { try { instream.close(); - } catch (IOException e) { } finally { instream = null; } @@ -185,7 +184,6 @@ private void closeDataStreams() { else if (reader != null) { try { reader.close(); - } catch (IOException e) { } finally { reader = null; } diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java index 6dd05c4937db..7141364b3025 100644 --- a/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java +++ b/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java @@ -1235,7 +1235,6 @@ private void shutdown() { } finally { lock.unlock(); } - } catch (IOException ignored) { } finally { owner.stop(); } diff --git a/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java b/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java index b2c0f189845e..d7af7c5d85b5 100644 --- a/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java +++ b/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java @@ -781,7 +781,6 @@ public void run() { try { name = InetAddress.getByName(hostAddress).getHostName(); - } catch (java.net.UnknownHostException e) { } finally { synchronized(this) { reverseLookup = name; diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMNormalizer.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMNormalizer.java index 22198efcbb88..803f2a83b2a2 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMNormalizer.java +++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMNormalizer.java @@ -719,11 +719,7 @@ private void processDTD(String xmlVersion, String schemaLocation) { loader.setErrorHandler(fConfiguration.getErrorHandler()); loader.loadGrammarWithContext((XMLDTDValidator) fValidationHandler, rootName, publicId, systemId, baseSystemId, internalSubset); - } - // REVISIT: Should probably report this exception to the error handler. - catch (IOException e) { - } - finally { + } finally { if (loader != null) { CoreDOMImplementationImpl.singleton.releaseDTDLoader(xmlVersion, loader); } diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedOutputStream.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedOutputStream.java index 11ad6c3eaaab..a0986c148d06 100644 --- a/src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedOutputStream.java +++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedOutputStream.java @@ -147,8 +147,6 @@ public void close () throws IOException { is.close(); } /* some clients close the connection before empty chunk is sent */ - } catch (IOException e) { - } finally { closed = true; } diff --git a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTY.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTY.java index fcf9ed121662..056b78642203 100644 --- a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTY.java +++ b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTY.java @@ -742,7 +742,6 @@ boolean readCommandFile(File f) { } } } - } catch (IOException e) { } finally { if (inFile != null) { try { diff --git a/test/hotspot/jtreg/compiler/gcbarriers/TestMembarDependencies.java b/test/hotspot/jtreg/compiler/gcbarriers/TestMembarDependencies.java index bbd518c67565..ccaf19e13fa7 100644 --- a/test/hotspot/jtreg/compiler/gcbarriers/TestMembarDependencies.java +++ b/test/hotspot/jtreg/compiler/gcbarriers/TestMembarDependencies.java @@ -72,8 +72,6 @@ public void test1(TestMembarDependencies obj) { // Method call defines memory state that is then // used by subsequent instructions/blocks (see below). test_m1(); - } catch (Exception e) { - } finally { // Oop write to field emits a GC post-barrier with a MembarVolatile // which has a wide memory effect (kills all memory). This creates an diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted002.java b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted002.java index 46832df7dc30..35d392286ea6 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted002.java @@ -58,7 +58,6 @@ public static int run(String args[], PrintStream out) { System.out.println("Can't reproduce OOME due to a limit on iterations/execution time. Test was useless."); throw new SkippedException("Test did not get an OutOfMemory error"); - } catch (OutOfMemoryError e) { } finally { stress.finish(); } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadMXBean/MXBeanTestThread.java b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadMXBean/MXBeanTestThread.java index 3ceee42ff029..855604dd38d0 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadMXBean/MXBeanTestThread.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadMXBean/MXBeanTestThread.java @@ -173,7 +173,6 @@ protected void allocateStress() { allocatedList = new ArrayList(); } } - } catch (OutOfMemoryError e) { } finally { stressAllocatedBytes += actuallyAllocated; } diff --git a/test/jdk/java/awt/FullScreen/MultimonFullscreenTest/MultimonDeadlockTest.java b/test/jdk/java/awt/FullScreen/MultimonFullscreenTest/MultimonDeadlockTest.java index 3a14013beaed..1d7037c3099c 100644 --- a/test/jdk/java/awt/FullScreen/MultimonFullscreenTest/MultimonDeadlockTest.java +++ b/test/jdk/java/awt/FullScreen/MultimonFullscreenTest/MultimonDeadlockTest.java @@ -55,7 +55,6 @@ public static void main(String argv[]) { } }); Thread.sleep(5000); - } catch (InterruptedException | InvocationTargetException ex) { } finally { for (int i = 0; i < devices.length; i++) { devices[i].setFullScreenWindow(null); diff --git a/test/jdk/java/awt/print/PrinterJob/PrintAWTImage.java b/test/jdk/java/awt/print/PrinterJob/PrintAWTImage.java index 2612ca6bdadd..4d2415f7b92a 100644 --- a/test/jdk/java/awt/print/PrinterJob/PrintAWTImage.java +++ b/test/jdk/java/awt/print/PrinterJob/PrintAWTImage.java @@ -67,7 +67,6 @@ public void actionPerformed(ActionEvent e) { pj.setPrintable(this); try { pj.print(); - } catch (PrinterException pe) { } finally { System.err.println("PRINT RETURNED"); } diff --git a/test/jdk/java/awt/print/PrinterJob/PrintBadImage.java b/test/jdk/java/awt/print/PrinterJob/PrintBadImage.java index ad3b3fd5d83c..860dd54a9aeb 100644 --- a/test/jdk/java/awt/print/PrinterJob/PrintBadImage.java +++ b/test/jdk/java/awt/print/PrinterJob/PrintBadImage.java @@ -43,7 +43,6 @@ public static void main(String args[]) { pj.setPrintable(pbi); try { pj.print(); - } catch (PrinterException pe) { } finally { System.err.println("PRINT RETURNED"); } diff --git a/test/jdk/java/awt/print/PrinterJob/PrintCompoundString.java b/test/jdk/java/awt/print/PrinterJob/PrintCompoundString.java index 82560d8964bf..89e084c15aad 100644 --- a/test/jdk/java/awt/print/PrinterJob/PrintCompoundString.java +++ b/test/jdk/java/awt/print/PrinterJob/PrintCompoundString.java @@ -86,7 +86,6 @@ public void actionPerformed(ActionEvent e) { pj.setPrintable(c); try { pj.print(); - } catch (PrinterException pe) { } finally { System.err.println("PRINT RETURNED"); } diff --git a/test/jdk/java/awt/print/PrinterJob/PrintNullString.java b/test/jdk/java/awt/print/PrinterJob/PrintNullString.java index 7e3101c6b30e..fb362b5f80e7 100644 --- a/test/jdk/java/awt/print/PrinterJob/PrintNullString.java +++ b/test/jdk/java/awt/print/PrinterJob/PrintNullString.java @@ -88,7 +88,6 @@ public void actionPerformed(ActionEvent e) { pj.setPrintable(c); try { pj.print(); - } catch (PrinterException pe) { } finally { System.err.println("PRINT RETURNED"); } diff --git a/test/jdk/java/awt/print/PrinterJob/PrintParenString.java b/test/jdk/java/awt/print/PrinterJob/PrintParenString.java index dc6d544d1264..68a30d216842 100644 --- a/test/jdk/java/awt/print/PrinterJob/PrintParenString.java +++ b/test/jdk/java/awt/print/PrinterJob/PrintParenString.java @@ -86,7 +86,6 @@ public void actionPerformed(ActionEvent e) { pj.setPrintable(c); try { pj.print(); - } catch (PrinterException pe) { } finally { System.err.println("PRINT RETURNED"); } diff --git a/test/jdk/java/awt/print/PrinterJob/PrintRotatedText.java b/test/jdk/java/awt/print/PrinterJob/PrintRotatedText.java index 5f5a6fa69d65..b34292f7c07a 100644 --- a/test/jdk/java/awt/print/PrinterJob/PrintRotatedText.java +++ b/test/jdk/java/awt/print/PrinterJob/PrintRotatedText.java @@ -87,7 +87,6 @@ public void actionPerformed(ActionEvent e) { pj.setPageable(c); try { pj.print(); - } catch (PrinterException pe) { } finally { System.err.println("PRINT RETURNED"); } diff --git a/test/jdk/java/awt/print/PrinterJob/PrintTranslatedFont.java b/test/jdk/java/awt/print/PrinterJob/PrintTranslatedFont.java index fefa737990ba..227f12197ba2 100644 --- a/test/jdk/java/awt/print/PrinterJob/PrintTranslatedFont.java +++ b/test/jdk/java/awt/print/PrinterJob/PrintTranslatedFont.java @@ -88,7 +88,6 @@ public void actionPerformed(ActionEvent e) { pj.setPrintable(c); try { pj.print(); - } catch (PrinterException pe) { } finally { System.err.println("PRINT RETURNED"); } diff --git a/test/jdk/java/awt/print/PrinterJob/PrintVolatileImage.java b/test/jdk/java/awt/print/PrinterJob/PrintVolatileImage.java index 82a7c9ed83d6..73fe49064840 100644 --- a/test/jdk/java/awt/print/PrinterJob/PrintVolatileImage.java +++ b/test/jdk/java/awt/print/PrinterJob/PrintVolatileImage.java @@ -78,7 +78,6 @@ public void actionPerformed(ActionEvent e) { pj.setPrintable(this); try { pj.print(); - } catch (PrinterException pe) { } finally { System.err.println("PRINT RETURNED"); } diff --git a/test/jdk/java/awt/print/PrinterJob/raster/RasterTest.java b/test/jdk/java/awt/print/PrinterJob/raster/RasterTest.java index 56adc8552f7c..cb76e66b42c2 100644 --- a/test/jdk/java/awt/print/PrinterJob/raster/RasterTest.java +++ b/test/jdk/java/awt/print/PrinterJob/raster/RasterTest.java @@ -89,7 +89,6 @@ public void actionPerformed(ActionEvent e) { pj.setPrintable(c); try { pj.print(); - } catch (PrinterException pe) { } finally { System.err.println("PRINT RETURNED"); } diff --git a/test/jdk/java/io/File/createTempFile/TargetDirectory.java b/test/jdk/java/io/File/createTempFile/TargetDirectory.java index 6fe20d7b57cd..87c227dca83b 100644 --- a/test/jdk/java/io/File/createTempFile/TargetDirectory.java +++ b/test/jdk/java/io/File/createTempFile/TargetDirectory.java @@ -80,7 +80,6 @@ public static void main(String[] args) throws Exception { try { File.createTempFile("readonly", null, target); throw new RuntimeException("Exception not thrown for read-only target directory"); - } catch (IOException expected) { } finally { target.delete(); } @@ -97,7 +96,6 @@ public static void main(String[] args) throws Exception { try { File.createTempFile("file", null, target); throw new RuntimeException("Exception not thrown for file target"); - } catch (IOException expected) { } finally { target.delete(); } diff --git a/test/jdk/java/io/RandomAccessFile/Seek.java b/test/jdk/java/io/RandomAccessFile/Seek.java index 21e4b7faeb45..67ec3c7a0092 100644 --- a/test/jdk/java/io/RandomAccessFile/Seek.java +++ b/test/jdk/java/io/RandomAccessFile/Seek.java @@ -43,7 +43,6 @@ public static void main(String argv[]) throws Exception raf.seek(-10); throw new Exception ("Should have thrown an IOException when seek offset is < 0"); - } catch (IOException e) { } finally { raf.close(); } diff --git a/test/jdk/java/io/Serializable/duplicateSerialFields/Test.java b/test/jdk/java/io/Serializable/duplicateSerialFields/Test.java index b1cc42642405..c5c77f59d00b 100644 --- a/test/jdk/java/io/Serializable/duplicateSerialFields/Test.java +++ b/test/jdk/java/io/Serializable/duplicateSerialFields/Test.java @@ -88,7 +88,6 @@ public static void main(String[] args) throws Exception { oin.readObject(); throw new Error( "read of A should fail with InvalidClassException"); - } catch (InvalidClassException e) { } finally { in.close(); } @@ -99,7 +98,6 @@ public static void main(String[] args) throws Exception { oin.readObject(); throw new Error( "read of B should fail with InvalidClassException"); - } catch (InvalidClassException e) { } finally { in.close(); } diff --git a/test/jdk/java/io/Serializable/fieldTypeString/Read.java b/test/jdk/java/io/Serializable/fieldTypeString/Read.java index 5152fbe612fe..c32904b1494f 100644 --- a/test/jdk/java/io/Serializable/fieldTypeString/Read.java +++ b/test/jdk/java/io/Serializable/fieldTypeString/Read.java @@ -65,7 +65,6 @@ public static void main(String[] args) throws Exception { ObjectInputStream oin = new ObjectInputStream(in); oin.readObject(); throw new Error(); - } catch (InvalidClassException ex) { } finally { in.close(); } diff --git a/test/jdk/java/net/URLConnection/ContentHandlers/ContentHandlersTest.java b/test/jdk/java/net/URLConnection/ContentHandlers/ContentHandlersTest.java index 49b2d7a6b64e..07f10b9ffc06 100644 --- a/test/jdk/java/net/URLConnection/ContentHandlers/ContentHandlersTest.java +++ b/test/jdk/java/net/URLConnection/ContentHandlers/ContentHandlersTest.java @@ -348,7 +348,6 @@ private static void copy(Reader src, Writer dst) throws IOException { } finally { try { src.close(); - } catch (IOException ignored1) { } finally { try { dst.close(); diff --git a/test/jdk/java/net/URLConnection/DisconnectAfterEOF.java b/test/jdk/java/net/URLConnection/DisconnectAfterEOF.java index a099796f610f..2a77aef42243 100644 --- a/test/jdk/java/net/URLConnection/DisconnectAfterEOF.java +++ b/test/jdk/java/net/URLConnection/DisconnectAfterEOF.java @@ -173,7 +173,6 @@ public void run() { } } - } catch (IOException ioe) { } finally { try { s.close(); diff --git a/test/jdk/java/net/httpclient/DigestEchoServer.java b/test/jdk/java/net/httpclient/DigestEchoServer.java index 187951405c2c..f5222b4a3779 100644 --- a/test/jdk/java/net/httpclient/DigestEchoServer.java +++ b/test/jdk/java/net/httpclient/DigestEchoServer.java @@ -1655,8 +1655,7 @@ public void run() { end.whenComplete( (r,t) -> { try { toClose.close(); } catch (IOException x) { } - try { tc.close(); } catch (IOException x) { } - finally {connectionCFs.remove(end);} + try { tc.close(); } finally {connectionCFs.remove(end);} }); connectionCFs.add(end); targetConnection = clientConnection = null; diff --git a/test/jdk/java/net/httpclient/HttpRedirectTest.java b/test/jdk/java/net/httpclient/HttpRedirectTest.java index dedcc36dda70..ccbc5c644775 100644 --- a/test/jdk/java/net/httpclient/HttpRedirectTest.java +++ b/test/jdk/java/net/httpclient/HttpRedirectTest.java @@ -323,13 +323,11 @@ public void tearDown() { client = null; try { executor.awaitTermination(2000, TimeUnit.MILLISECONDS); - } catch (Throwable x) { } finally { executor.shutdownNow(); } try { clientexec.awaitTermination(2000, TimeUnit.MILLISECONDS); - } catch (Throwable x) { } finally { clientexec.shutdownNow(); } diff --git a/test/jdk/java/net/httpclient/HttpSlowServerTest.java b/test/jdk/java/net/httpclient/HttpSlowServerTest.java index 85db9bba563b..2ac84aa12984 100644 --- a/test/jdk/java/net/httpclient/HttpSlowServerTest.java +++ b/test/jdk/java/net/httpclient/HttpSlowServerTest.java @@ -231,13 +231,11 @@ public void tearDown() { client = null; try { executor.awaitTermination(2000, TimeUnit.MILLISECONDS); - } catch (Throwable x) { } finally { executor.shutdownNow(); } try { clientexec.awaitTermination(2000, TimeUnit.MILLISECONDS); - } catch (Throwable x) { } finally { clientexec.shutdownNow(); } diff --git a/test/jdk/java/net/httpclient/LargeResponseTest.java b/test/jdk/java/net/httpclient/LargeResponseTest.java index bfc7c9ca5dbb..56207c477b7b 100644 --- a/test/jdk/java/net/httpclient/LargeResponseTest.java +++ b/test/jdk/java/net/httpclient/LargeResponseTest.java @@ -228,13 +228,11 @@ public void tearDown() { client = null; try { executor.awaitTermination(2000, TimeUnit.MILLISECONDS); - } catch (Throwable x) { } finally { executor.shutdownNow(); } try { clientexec.awaitTermination(2000, TimeUnit.MILLISECONDS); - } catch (Throwable x) { } finally { clientexec.shutdownNow(); } diff --git a/test/jdk/java/net/httpclient/ProxyTest.java b/test/jdk/java/net/httpclient/ProxyTest.java index 8763e168a063..227193097b3c 100644 --- a/test/jdk/java/net/httpclient/ProxyTest.java +++ b/test/jdk/java/net/httpclient/ProxyTest.java @@ -379,8 +379,7 @@ public void accept() { end = CompletableFuture.allOf(end1, end2); end.whenComplete( (r,t) -> { - try { toClose.close(); } catch (IOException x) { } - finally {connectionCFs.remove(end);} + try { toClose.close(); } finally {connectionCFs.remove(end);} }); connectionCFs.add(end); t1.start(); diff --git a/test/jdk/java/net/httpclient/http2/ProxyTest2.java b/test/jdk/java/net/httpclient/http2/ProxyTest2.java index 733c21ffe68f..637471f069f3 100644 --- a/test/jdk/java/net/httpclient/http2/ProxyTest2.java +++ b/test/jdk/java/net/httpclient/http2/ProxyTest2.java @@ -309,8 +309,7 @@ public void accept() { end = CompletableFuture.allOf(end1, end2); end.whenComplete( (r,t) -> { - try { toClose.close(); } catch (IOException x) { } - finally {connectionCFs.remove(end);} + try { toClose.close(); } finally {connectionCFs.remove(end);} }); connectionCFs.add(end); t1.start(); diff --git a/test/jdk/java/net/spi/URLStreamHandlerProvider/Basic.java b/test/jdk/java/net/spi/URLStreamHandlerProvider/Basic.java index d2c635fb9ecd..282fa34d94ed 100644 --- a/test/jdk/java/net/spi/URLStreamHandlerProvider/Basic.java +++ b/test/jdk/java/net/spi/URLStreamHandlerProvider/Basic.java @@ -310,7 +310,6 @@ static void copy(Reader src, Writer dst) throws IOException { } finally { try { src.close(); - } catch (IOException ignored1) { } finally { try { dst.close(); diff --git a/test/jdk/java/nio/channels/FileChannel/Transfer.java b/test/jdk/java/nio/channels/FileChannel/Transfer.java index 453230fff959..a7843d3862a4 100644 --- a/test/jdk/java/nio/channels/FileChannel/Transfer.java +++ b/test/jdk/java/nio/channels/FileChannel/Transfer.java @@ -336,7 +336,6 @@ public void xferTest09() throws Exception { // for bug 6984545 try { fc2.transferFrom(fc1, 0L, 0); throw new RuntimeException("NonReadableChannelException expected"); - } catch (NonReadableChannelException expected) { } finally { fc1.close(); fc2.close(); diff --git a/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/EchoService.java b/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/EchoService.java index 077fc9afb653..4dfcb4c43146 100644 --- a/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/EchoService.java +++ b/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/EchoService.java @@ -133,7 +133,6 @@ public static int count() { public void run() { try { doIt(sc, -1, -1); - } catch (IOException x) { } finally { synchronized (lock) { count--; diff --git a/test/jdk/java/nio/file/Files/SBC.java b/test/jdk/java/nio/file/Files/SBC.java index 8f470b8d9ed0..279423bc09b8 100644 --- a/test/jdk/java/nio/file/Files/SBC.java +++ b/test/jdk/java/nio/file/Files/SBC.java @@ -236,7 +236,6 @@ static void noFollowLinksTests(Path dir) throws Exception { try { Files.newByteChannel(link, READ, LinkOption.NOFOLLOW_LINKS); throw new RuntimeException(); - } catch (IOException | UnsupportedOperationException x) { } finally { TestUtil.deleteUnchecked(link); } diff --git a/test/jdk/java/util/concurrent/tck/JSR166TestCase.java b/test/jdk/java/util/concurrent/tck/JSR166TestCase.java index a5d491f6ce0e..d9e2af84af8c 100644 --- a/test/jdk/java/util/concurrent/tck/JSR166TestCase.java +++ b/test/jdk/java/util/concurrent/tck/JSR166TestCase.java @@ -1451,7 +1451,6 @@ public void runWithSecurityManagerWithPermissions(Runnable r, Policy.setPolicy(permissivePolicy()); System.setSecurityManager(new SecurityManager()); runWithSecurityManagerWithPermissions(r, permissions); - } catch (UnsupportedOperationException ok) { } finally { try { System.setSecurityManager(null); diff --git a/test/jdk/javax/imageio/plugins/jpeg/JpegWriterLeakTest.java b/test/jdk/javax/imageio/plugins/jpeg/JpegWriterLeakTest.java index bb5fc06e99b8..7d790bf03e5a 100644 --- a/test/jdk/javax/imageio/plugins/jpeg/JpegWriterLeakTest.java +++ b/test/jdk/javax/imageio/plugins/jpeg/JpegWriterLeakTest.java @@ -71,7 +71,6 @@ public static void main(String[] args) { // NB: dispose() or reset() workarounds the problem. - } catch (IOException e) { } finally { writer = null; } diff --git a/test/jdk/javax/naming/spi/providers/InitialContextTest.java b/test/jdk/javax/naming/spi/providers/InitialContextTest.java index 054365878a15..8b6fcf855eff 100644 --- a/test/jdk/javax/naming/spi/providers/InitialContextTest.java +++ b/test/jdk/javax/naming/spi/providers/InitialContextTest.java @@ -347,7 +347,6 @@ private static void copy(Reader src, Writer dst) throws IOException { } finally { try { src.close(); - } catch (IOException ignored1) { } finally { try { dst.close(); diff --git a/test/jdk/javax/sound/sampled/AudioInputStream/FrameLengthAfterConversion.java b/test/jdk/javax/sound/sampled/AudioInputStream/FrameLengthAfterConversion.java index 2761e34bc670..409f1473126a 100644 --- a/test/jdk/javax/sound/sampled/AudioInputStream/FrameLengthAfterConversion.java +++ b/test/jdk/javax/sound/sampled/AudioInputStream/FrameLengthAfterConversion.java @@ -166,8 +166,6 @@ private static void testAfterSaveToFile(final AudioFileWriter afw, final long frameLength = ais.getFrameLength(); ais.close(); validate(frameLength); - } catch (IllegalArgumentException | UnsupportedAudioFileException - ignored) { } finally { Files.delete(Paths.get(temp.getAbsolutePath())); } diff --git a/test/jdk/sun/net/www/http/HttpClient/ProxyTest.java b/test/jdk/sun/net/www/http/HttpClient/ProxyTest.java index 71b8660e4ec1..3c90148aaa03 100644 --- a/test/jdk/sun/net/www/http/HttpClient/ProxyTest.java +++ b/test/jdk/sun/net/www/http/HttpClient/ProxyTest.java @@ -156,7 +156,6 @@ public void run() { client = server.accept(); (new HttpProxyHandler(client)).start(); } - } catch (Exception e) { } finally { try { server.close(); } catch (IOException unused) {} } diff --git a/test/jdk/sun/net/www/protocol/http/ProtocolRedirect.java b/test/jdk/sun/net/www/protocol/http/ProtocolRedirect.java index 5f9723abea36..7259ded32948 100644 --- a/test/jdk/sun/net/www/protocol/http/ProtocolRedirect.java +++ b/test/jdk/sun/net/www/protocol/http/ProtocolRedirect.java @@ -89,7 +89,6 @@ public void close() { stopped = true; try { if (s != null) s.close(); - } catch (Throwable x) { } finally { try { ssock.close(); } catch (Throwable x) {} } diff --git a/test/jdk/sun/nio/cs/MalformedSurrogates.java b/test/jdk/sun/nio/cs/MalformedSurrogates.java index 462e1651d090..d29d44a496cf 100644 --- a/test/jdk/sun/nio/cs/MalformedSurrogates.java +++ b/test/jdk/sun/nio/cs/MalformedSurrogates.java @@ -75,7 +75,6 @@ public static void testMalformedSurrogate(Charset cs, String surrogate) throws I try { en.encode(CharBuffer.wrap(surrogate)); throw new RuntimeException("Should throw MalformedInputException or UnmappableCharacterException"); - } catch (MalformedInputException | UnmappableCharacterException ex) { } finally { en.reset(); } @@ -91,7 +90,6 @@ public static void testNormalSurrogate(Charset cs, String surrogate) throws IOEx CharsetEncoder en = cs.newEncoder(); try { en.encode(CharBuffer.wrap(surrogate)); - } catch (UnmappableCharacterException ex) { } finally { en.reset(); } diff --git a/test/langtools/jdk/javadoc/tool/CheckResourceKeys.java b/test/langtools/jdk/javadoc/tool/CheckResourceKeys.java index effad2f3f987..2f5f6db9bbce 100644 --- a/test/langtools/jdk/javadoc/tool/CheckResourceKeys.java +++ b/test/langtools/jdk/javadoc/tool/CheckResourceKeys.java @@ -274,7 +274,6 @@ void scan(JavaFileObject fo, Set results) throws IOException { results.add(v); } } - } catch (ConstantPoolException ignore) { } finally { in.close(); } diff --git a/test/langtools/tools/javac/T8022186/DeadCodeGeneratedForEmptyTryTest.java b/test/langtools/tools/javac/T8022186/DeadCodeGeneratedForEmptyTryTest.java index a443b04c4e19..d9140c2ee397 100644 --- a/test/langtools/tools/javac/T8022186/DeadCodeGeneratedForEmptyTryTest.java +++ b/test/langtools/tools/javac/T8022186/DeadCodeGeneratedForEmptyTryTest.java @@ -217,7 +217,7 @@ public class Test6 { void methodToLookFor() { try { // empty try statement - try { } catch (Exception e) { } finally { } + try { } finally { } } catch (Exception e) { System.out.println("EXCEPTION"); } finally { @@ -241,7 +241,7 @@ public class Test8 { void methodToLookFor() { try { // empty try statement with skip statement - try { ; } catch (Exception e) { } finally { } + try { ; } finally { } } catch (Exception e) { System.out.println("EXCEPTION"); } finally { diff --git a/test/langtools/tools/javac/flow/tests/TestCaseTry.java b/test/langtools/tools/javac/flow/tests/TestCaseTry.java index 63a3e59a2cf2..816b264c7a75 100644 --- a/test/langtools/tools/javac/flow/tests/TestCaseTry.java +++ b/test/langtools/tools/javac/flow/tests/TestCaseTry.java @@ -24,9 +24,7 @@ void m1() { try { o = ""; o.hashCode(); - } catch (RuntimeException e) { - } - finally { + } finally { o = "finally"; o.hashCode(); }