--- a/jdk/src/solaris/classes/sun/awt/X11/XFramePeer.java	Fri Nov 12 15:07:29 2010 -0800
+++ b/jdk/src/solaris/classes/sun/awt/X11/XFramePeer.java	Thu Nov 18 14:26:19 2010 +0300
@@ -150,6 +150,8 @@
 
     void updateChildrenSizes() {
         super.updateChildrenSizes();
+        int height = getMenuBarHeight();
+
         // XWindow.reshape calls XBaseWindow.xSetBounds, which acquires
         // the AWT lock, so we have to acquire the AWT lock here
         // before getStateLock() to avoid a deadlock with the Toolkit thread
@@ -159,7 +161,7 @@
             synchronized(getStateLock()) {
                 int width = dimensions.getClientSize().width;
                 if (menubarPeer != null) {
-                    menubarPeer.reshape(0, 0, width, getMenuBarHeight());
+                    menubarPeer.reshape(0, 0, width, height);
                 }
             }
         } finally {