src/share/classes/java/awt/MenuComponent.java

@@ -286,11 +286,11 @@
      * @see       java.awt.font.TextAttribute
      */
     public void setFont(Font f) {
         font = f;
         //Fixed 6312943: NullPointerException in method MenuComponent.setFont(Font)
-        MenuComponentPeer peer = (MenuComponentPeer)this.peer;
+        MenuComponentPeer peer = this.peer;
         if (peer != null) {
             peer.setFont(f);
         }
     }
 

@@ -299,11 +299,11 @@
      * appearance of the menu component without changing the functionality of
      * the menu component.
      */
     public void removeNotify() {
         synchronized (getTreeLock()) {
-            MenuComponentPeer p = (MenuComponentPeer)this.peer;
+            MenuComponentPeer p = this.peer;
             if (p != null) {
                 Toolkit.getEventQueue().removeSourceEvents(this, true);
                 this.peer = null;
                 p.dispose();
             }