Index: java/awt/Window.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Window.java,v
retrieving revision 1.58
diff -u -r1.58 Window.java
--- java/awt/Window.java	28 Sep 2005 16:50:34 -0000	1.58
+++ java/awt/Window.java	29 Sep 2005 14:02:01 -0000
@@ -280,14 +280,14 @@
    */
   public void show()
   {
+    synchronized (getTreeLock())
+    {
     if (parent != null && !parent.isDisplayable())
       parent.addNotify();
     if (peer == null)
       addNotify();
 
     // Show visible owned windows.
-    synchronized (getTreeLock())
-      {
 	Iterator e = ownedWindows.iterator();
 	while(e.hasNext())
 	  {
@@ -304,7 +304,6 @@
 	      // synchronous access to ownedWindows there.
 	      e.remove();
 	  }
-      }
     validate();
     super.show();
     toFront();
@@ -312,8 +311,6 @@
     KeyboardFocusManager manager = KeyboardFocusManager.getCurrentKeyboardFocusManager ();
     manager.setGlobalFocusedWindow (this);
     
-    synchronized (getTreeLock())
-    {
     if (!shown)
       {
         FocusTraversalPolicy policy = getFocusTraversalPolicy ();