From 79a36f32ee5ee2dbbc9078086229747784e7fe81 Mon Sep 17 00:00:00 2001
From: Oleg Pekhovskiy <bagiras@openjdk.org>
Date: Wed, 25 Jul 2012 19:46:00 +0400
Subject: [PATCH] 7185678:
 java/awt/Menu/NullMenuLabelTest/NullMenuLabelTest.java failed with NPE

Reviewed-by: art, ahgross
---
 jdk/src/solaris/classes/sun/awt/X11/XMenuItemPeer.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jdk/src/solaris/classes/sun/awt/X11/XMenuItemPeer.java b/jdk/src/solaris/classes/sun/awt/X11/XMenuItemPeer.java
index 8cd8a725af4..496524c10b3 100644
--- a/jdk/src/solaris/classes/sun/awt/X11/XMenuItemPeer.java
+++ b/jdk/src/solaris/classes/sun/awt/X11/XMenuItemPeer.java
@@ -202,7 +202,8 @@ public class XMenuItemPeer implements MenuItemPeer {
         if (target == null) {
             return "";
         }
-        return AWTAccessor.getMenuItemAccessor().getLabel(target);
+        String label = AWTAccessor.getMenuItemAccessor().getLabel(target);
+        return (label == null) ? "" : label;
     }
 
     boolean isTargetEnabled() {