Merge branch 'ikvm-jdk8u412-b07' into ikvm-jdk8u422-b05

ikvmnet · Jul 24, 2024 · 3b6833f · 3b6833f
2 parents 3a0a4df + 2678c7e
commit 3b6833f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 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;
+        }
     }
 }
diff --git a/jdk/test/TEST.ROOT b/jdk/test/TEST.ROOT
@@ -12,7 +12,7 @@
 # A "headful" test requires a graphical environment to meaningfully
 # run. Tests that are not headful are "headless."
 
-keys=2d dnd i18n intermittent randomness headful jfr
+keys=2d dnd i18n intermittent randomness headful jfr printer
 
 # Tests that must run in othervm mode
 othervm.dirs=java/awt java/beans java/rmi javax/accessibility javax/imageio javax/sound javax/print javax/management com/sun/awt sun/awt sun/java2d sun/pisces sun/rmi