jdk/src/java.desktop/share/classes/java/awt/MenuBar.java
changeset 30918 ee2374d4aae3
parent 30471 c1568a2416a8
child 32118 5b0d9a83143b
--- a/jdk/src/java.desktop/share/classes/java/awt/MenuBar.java	Fri May 08 16:46:24 2015 +0300
+++ b/jdk/src/java.desktop/share/classes/java/awt/MenuBar.java	Fri May 08 17:35:15 2015 +0300
@@ -222,7 +222,6 @@
             if (m.parent != null) {
                 m.parent.remove(m);
             }
-            menus.addElement(m);
             m.parent = this;
 
             MenuBarPeer peer = (MenuBarPeer)this.peer;
@@ -232,6 +231,7 @@
                 }
                 peer.addMenu(m);
             }
+            menus.addElement(m);
             return m;
         }
     }
@@ -248,9 +248,9 @@
             menus.removeElementAt(index);
             MenuBarPeer peer = (MenuBarPeer)this.peer;
             if (peer != null) {
+                peer.delMenu(index);
                 m.removeNotify();
                 m.parent = null;
-                peer.delMenu(index);
             }
             if (helpMenu == m) {
                 helpMenu = null;