src/java.desktop/unix/classes/sun/awt/X11/XFramePeer.java

*** 1,7 ****
  /*
!  * Copyright (c) 2002, 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) 2002, 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
*** 122,132 ****
                          menubarPeer.dispose();
                          menubarPeer = null;
                      }
                  } else {
                      menubar = mb;
!                     menubarPeer = (XMenuBarPeer) mb.getPeer();
                      if (menubarPeer != null) {
                          menubarPeer.init((Frame)target);
                      }
                  }
              }
--- 122,133 ----
                          menubarPeer.dispose();
                          menubarPeer = null;
                      }
                  } else {
                      menubar = mb;
!                     menubarPeer = AWTAccessor.getMenuComponentAccessor()
!                                              .getPeer(mb);
                      if (menubarPeer != null) {
                          menubarPeer.init((Frame)target);
                      }
                  }
              }