getAudioInputStream was not closing the stream in case of exception c…

…ausing the file to remain open and breaking the GetSoundBankSecurityException test which immediately tries to delete it.
ikvmnet · Jul 25, 2024 · f195e24 · f195e24
1 parent 1b0aefd
commit f195e24
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/jdk/src/share/classes/com/sun/media/sound/WaveFloatFileReader.java b/jdk/src/share/classes/com/sun/media/sound/WaveFloatFileReader.java
@@ -160,12 +160,23 @@ public AudioFileFormat getAudioFileFormat(File file)
 
     public AudioInputStream getAudioInputStream(URL url)
             throws UnsupportedAudioFileException, IOException {
-        return getAudioInputStream(new BufferedInputStream(url.openStream()));
+        InputStream stream = url.openStream();
+        try {
+            return getAudioInputStream(new BufferedInputStream(stream));
+        } catch (Exception e) {
+            stream.close();
+            throw e;
+        }
     }
 
     public AudioInputStream getAudioInputStream(File file)
             throws UnsupportedAudioFileException, IOException {
-        return getAudioInputStream(new BufferedInputStream(new FileInputStream(
-                file)));
+        InputStream stream = new FileInputStream(file);
+        try {
+            return getAudioInputStream(new BufferedInputStream(stream));
+        } catch (Exception e) {
+            stream.close();
+            throw e;
+        }
     }
 }