[Patch] javax,imageio.spi.IIORegistry

[Michael Koch]

Hi list,


I just commited the attached patch to merge the fix for
javax.imageio.spi.IIORegistry from GNU classpath to HEAD.


Michael


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

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

-------------- next part --------------
Index: javax/imageio/spi/IIORegistry.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/imageio/spi/IIORegistry.java,v
retrieving revision 1.2
diff -u -r1.2 IIORegistry.java
--- javax/imageio/spi/IIORegistry.java	7 Feb 2005 13:22:36 -0000	1.2
+++ javax/imageio/spi/IIORegistry.java	27 Apr 2005 20:00:39 -0000
@@ -81,7 +81,9 @@
 
     // XXX: Register built-in Spis here.
 
-    ((ClasspathToolkit)Toolkit.getDefaultToolkit()).registerImageIOSpis(this);
+    Toolkit toolkit = Toolkit.getDefaultToolkit();
+    if (toolkit instanceof ClasspathToolkit)
+      ((ClasspathToolkit)toolkit).registerImageIOSpis(this);
     
     registerApplicationClasspathSpis();
   }