diff options
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/javax/imageio/spi/IIORegistry.java | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 9d66db2..8bf142f 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -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 diff --git a/libjava/javax/imageio/spi/IIORegistry.java b/libjava/javax/imageio/spi/IIORegistry.java index 6531fab..01cfe52 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(); } |