From d5b3bde9c8f779a3f9cfeb66d4eda4d10bdbc68c Mon Sep 17 00:00:00 2001 From: mkoch Date: Wed, 27 Apr 2005 20:01:23 +0000 Subject: 2005-04-27 Jeroen Frijters * javax/imageio/spi/IIORegistry.java (IIORegistry): Don't assume that awt Toolkit is always ClasspathToolkit. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@98878 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/javax/imageio/spi/IIORegistry.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libjava/javax/imageio/spi/IIORegistry.java') diff --git a/libjava/javax/imageio/spi/IIORegistry.java b/libjava/javax/imageio/spi/IIORegistry.java index 6531fabca10..01cfe5274c8 100644 --- a/libjava/javax/imageio/spi/IIORegistry.java +++ b/libjava/javax/imageio/spi/IIORegistry.java @@ -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(); } -- cgit v1.2.3