src/java.desktop/macosx/classes/sun/lwawt/macosx/CTrayIcon.java

*** 96,114 ****
      }
  
      private native long nativeCreate();
  
      //invocation from the AWTTrayIcon.m
!     public long getPopupMenuModel(){
!         if(popup == null) {
!             PopupMenu popupMenu = target.getPopupMenu();
!             if (popupMenu != null) {
!                 popup = popupMenu;
              } else {
                  return 0L;
              }
          }
          return checkAndCreatePopupPeer().getModel();
      }
  
      /**
       * We display tray icon message as a small dialog with OK button.
--- 96,125 ----
      }
  
      private native long nativeCreate();
  
      //invocation from the AWTTrayIcon.m
!     public long getPopupMenuModel() {
!         PopupMenu newPopup = target.getPopupMenu();
! 
!         if (popup == newPopup) {
!             if (popup == null) {
!                 return 0L;
!             }
!         } else {
!             if (newPopup != null) {
!                 if (popup != null) {
!                     popup.removeNotify();
!                     popup = newPopup;
!                 } else {
!                     popup = newPopup;
!                 }
              } else {
                  return 0L;
              }
          }
+ 
          return checkAndCreatePopupPeer().getModel();
      }
  
      /**
       * We display tray icon message as a small dialog with OK button.