src/java.desktop/share/classes/java/awt/MenuBar.java

*** 1,7 ****
  /*
!  * Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 179,201 ****
       * Sets the specified menu to be this menu bar's help menu.
       * If this menu bar has an existing help menu, the old help menu is
       * removed from the menu bar, and replaced with the specified menu.
       * @param m    the menu to be set as the help menu
       */
!     public void setHelpMenu(Menu m) {
          synchronized (getTreeLock()) {
              if (helpMenu == m) {
                  return;
              }
              if (helpMenu != null) {
                  remove(helpMenu);
              }
              if (m.parent != this) {
                  add(m);
              }
-             helpMenu = m;
-             if (m != null) {
                  m.isHelpMenu = true;
                  m.parent = this;
                  MenuBarPeer peer = (MenuBarPeer)this.peer;
                  if (peer != null) {
                      if (m.peer == null) {
--- 179,201 ----
       * Sets the specified menu to be this menu bar's help menu.
       * If this menu bar has an existing help menu, the old help menu is
       * removed from the menu bar, and replaced with the specified menu.
       * @param m    the menu to be set as the help menu
       */
!     public void setHelpMenu(final Menu m) {
          synchronized (getTreeLock()) {
              if (helpMenu == m) {
                  return;
              }
              if (helpMenu != null) {
                  remove(helpMenu);
              }
+             helpMenu = m;
+             if (m != null) {
                  if (m.parent != this) {
                      add(m);
                  }
                  m.isHelpMenu = true;
                  m.parent = this;
                  MenuBarPeer peer = (MenuBarPeer)this.peer;
                  if (peer != null) {
                      if (m.peer == null) {
*** 240,259 ****
       * Removes the menu located at the specified
       * index from this menu bar.
       * @param        index   the position of the menu to be removed.
       * @see          java.awt.MenuBar#add(java.awt.Menu)
       */
!     public void remove(int index) {
          synchronized (getTreeLock()) {
              Menu m = getMenu(index);
              menus.removeElementAt(index);
              MenuBarPeer peer = (MenuBarPeer)this.peer;
              if (peer != null) {
                  m.removeNotify();
                  m.parent = null;
                  peer.delMenu(index);
              }
          }
      }
  
      /**
       * Removes the specified menu component from this menu bar.
--- 240,263 ----
       * Removes the menu located at the specified
       * index from this menu bar.
       * @param        index   the position of the menu to be removed.
       * @see          java.awt.MenuBar#add(java.awt.Menu)
       */
!     public void remove(final int index) {
          synchronized (getTreeLock()) {
              Menu m = getMenu(index);
              menus.removeElementAt(index);
              MenuBarPeer peer = (MenuBarPeer)this.peer;
              if (peer != null) {
                  m.removeNotify();
                  m.parent = null;
                  peer.delMenu(index);
              }
+             if (helpMenu == m) {
+                 helpMenu = null;
+                 m.isHelpMenu = false;
+             }
          }
      }
  
      /**
       * Removes the specified menu component from this menu bar.