summaryrefslogtreecommitdiff
path: root/libjava/javax
diff options
context:
space:
mode:
authormkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4>2005-04-27 20:01:23 +0000
committermkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4>2005-04-27 20:01:23 +0000
commitd5b3bde9c8f779a3f9cfeb66d4eda4d10bdbc68c (patch)
tree34b182d459f31b1a7e261e35a7dfc5cb067b8287 /libjava/javax
parent95b0d8d06578b6c87c840bac2d9a85b5df15ecb6 (diff)
downloadgcc-d5b3bde9c8f779a3f9cfeb66d4eda4d10bdbc68c.tar.gz
2005-04-27 Jeroen Frijters <jeroen@frijters.net>
* 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
Diffstat (limited to 'libjava/javax')
-rw-r--r--libjava/javax/imageio/spi/IIORegistry.java4
1 files changed, 3 insertions, 1 deletions
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();
}