IIORegistry.java (IIORegistry): Don't assume that awt Toolkit is always ClasspathToolkit.

2005-04-27  Jeroen Frijters  <jeroen@frijters.net>

	* javax/imageio/spi/IIORegistry.java (IIORegistry):
	Don't assume that awt Toolkit is always ClasspathToolkit.

From-SVN: r98878
This commit is contained in:
Jeroen Frijters 2005-04-27 20:01:23 +00:00 committed by Michael Koch
parent 49d766869a
commit afc658e400
2 changed files with 8 additions and 1 deletions

View File

@ -1,3 +1,8 @@
2005-04-27 Jeroen Frijters <jeroen@frijters.net>
* javax/imageio/spi/IIORegistry.java (IIORegistry):
Don't assume that awt Toolkit is always ClasspathToolkit.
2005-04-27 Chris Burdess <dog@gnu.org>
* java/net/protocol/http/HTTPURLConnection.java (connect): Accept

View File

@ -81,7 +81,9 @@ public final class IIORegistry extends ServiceRegistry
// XXX: Register built-in Spis here.
((ClasspathToolkit)Toolkit.getDefaultToolkit()).registerImageIOSpis(this);
Toolkit toolkit = Toolkit.getDefaultToolkit();
if (toolkit instanceof ClasspathToolkit)
((ClasspathToolkit)toolkit).registerImageIOSpis(this);
registerApplicationClasspathSpis();
}