[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: IIORegistry fix

[Kaffe CVS]

PatchSet 5684 
Date: 2005/04/17 23:51:41
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: IIORegistry fix

2005-04-17  Dalibor Topic  <robilad at kaffe.org>

        Resynced with GNU Classpath.

        2005-03-26  Jeroen Frijters  <jeroen at frijters.net>

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

Members: 
	ChangeLog:1.3850->1.3851 
	libraries/javalib/javax/imageio/spi/IIORegistry.java:1.3->1.4 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3850 kaffe/ChangeLog:1.3851
--- kaffe/ChangeLog:1.3850	Sun Apr 17 23:37:26 2005
+++ kaffe/ChangeLog	Sun Apr 17 23:51:41 2005
@@ -2,6 +2,15 @@
 
 	Resynced with GNU Classpath.
 
+	2005-03-26  Jeroen Frijters  <jeroen at frijters.net>
+
+        * javax/imageio/spi/IIORegistry.java (IIORegistry):
+        Don't assume that awt Toolkit is always ClasspathToolkit.
+
+2005-04-17  Dalibor Topic  <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
+
 	2005-03-23  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
         * gnu/xml/dom/html2/DomHTMLParser.java
Index: kaffe/libraries/javalib/javax/imageio/spi/IIORegistry.java
diff -u kaffe/libraries/javalib/javax/imageio/spi/IIORegistry.java:1.3 kaffe/libraries/javalib/javax/imageio/spi/IIORegistry.java:1.4
--- kaffe/libraries/javalib/javax/imageio/spi/IIORegistry.java:1.3	Thu Jan 13 08:56:35 2005
+++ kaffe/libraries/javalib/javax/imageio/spi/IIORegistry.java	Sun Apr 17 23:51:42 2005
@@ -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();
   }