--- a/ChangeLog	Wed Apr 30 17:08:19 2008 -0400
+++ b/ChangeLog	Thu May 01 10:57:58 2008 +0200
@@ -1,3 +1,18 @@
+2008-05-01  Mark Wielaard  <mwielaard@redhat.com>
+
+	* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/
+	DLSSoundbankReader.java (getSoundbank(URL)): Don't throw IOException.
+	(getSoundbank(File)): Allow soundbanks not ending in .dls.
+	* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/
+	PATSoundbankReader.java (getSoundbank(URL)): Don't throw IOException.
+	* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/
+	SF2SoundbankReader.java (getSoundbank(URL)): Likewise.
+	(getSoundbank(File)): Allow soundbanks not ending in .sf2.
+	* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/
+	SoftSynthesizer.java (unloadAllInstruments): Check if Soundbank
+	supported.
+	(unloadInstruments): Likewise.
+
 2008-04-30  Thomas Fitzsimmons  <fitzsim@redhat.com>
 
 	* rt/net/sourceforge/jnlp/security/MoreInfoPane.java: Fix typo.

--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbankReader.java	Wed Apr 30 17:08:19 2008 -0400
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbankReader.java	Thu May 01 10:57:58 2008 +0200
@@ -52,6 +52,10 @@
 		{
 			return null;
 		}		
+		catch(IOException ioe)
+		{
+			return null;
+		}
 	}
 
 	public Soundbank getSoundbank(InputStream stream) throws InvalidMidiDataException, IOException {
@@ -68,7 +72,6 @@
 	}
 	
 	public Soundbank getSoundbank(File file) throws InvalidMidiDataException, IOException {
-		if(!file.getPath().toLowerCase().endsWith(".dls")) return null;		
 		try
 		{
 			return new DLSSoundbank(file);

--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/PATSoundbankReader.java	Wed Apr 30 17:08:19 2008 -0400
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/PATSoundbankReader.java	Thu May 01 10:57:58 2008 +0200
@@ -60,6 +60,8 @@
 			return snk;
 		} catch (InvalidFormatException e) {
 			return null;
+		} catch (IOException ioe) {
+			return null;
 		}
 	}
 

--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2SoundbankReader.java	Wed Apr 30 17:08:19 2008 -0400
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2SoundbankReader.java	Thu May 01 10:57:58 2008 +0200
@@ -55,6 +55,10 @@
 		{
 			return null;
 		}		
+		catch(IOException ioe)
+		{
+			return null;
+		}
 	}
 
 	public Soundbank getSoundbank(InputStream stream) throws InvalidMidiDataException, IOException {
@@ -71,7 +75,6 @@
 	}
 
 	public Soundbank getSoundbank(File file) throws InvalidMidiDataException, IOException {
-		if(!file.getPath().toLowerCase().endsWith(".sf2")) return null;		
 		try
 		{
 			return new SF2Soundbank(file);

--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java	Wed Apr 30 17:08:19 2008 -0400
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java	Thu May 01 10:57:58 2008 +0200
@@ -593,6 +593,9 @@
 	}
 
 	public void unloadAllInstruments(Soundbank soundbank) {
+
+		if(soundbank == null || !isSoundbankSupported(soundbank))
+			throw new IllegalArgumentException("Unsupported soundbank: " + soundbank);
 		
 		if(!isOpen())
 			return;
@@ -619,6 +622,9 @@
 
 	public void unloadInstruments(Soundbank soundbank, Patch[] patchList) {
 		
+		if(soundbank == null || !isSoundbankSupported(soundbank))
+			throw new IllegalArgumentException("Unsupported soundbank: " + soundbank);
+
 		if(!isOpen())
 			return;