Index: java/awt/Component.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Component.java,v
retrieving revision 1.45
diff -u -r1.45 Component.java
--- java/awt/Component.java	27 Sep 2004 15:11:46 -0000	1.45
+++ java/awt/Component.java	8 Oct 2004 22:30:25 -0000
@@ -576,8 +576,6 @@
   {
     incrementalDraw = Boolean.getBoolean ("awt.image.incrementalDraw");
     redrawRate = Long.getLong ("awt.image.redrawrate");
-    // Set the default KeyboardFocusManager.
-    KeyboardFocusManager.setCurrentKeyboardFocusManager (null);
   }
 
   // Public and protected API.
Index: java/awt/KeyboardFocusManager.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/KeyboardFocusManager.java,v
retrieving revision 1.9
diff -u -r1.9 KeyboardFocusManager.java
--- java/awt/KeyboardFocusManager.java	27 Sep 2004 15:11:46 -0000	1.9
+++ java/awt/KeyboardFocusManager.java	8 Oct 2004 22:30:25 -0000
@@ -262,6 +262,10 @@
   public static KeyboardFocusManager getCurrentKeyboardFocusManager ()
   {
     ThreadGroup currentGroup = Thread.currentThread ().getThreadGroup ();
+
+    if (currentKeyboardFocusManagers.get (currentGroup) == null)
+      setCurrentKeyboardFocusManager (null);
+
     return (KeyboardFocusManager) currentKeyboardFocusManagers.get (currentGroup);
   }