From 1df6a97a4d7d5aeb129c2c9bc8e3baf158ddac9f Mon Sep 17 00:00:00 2001
From: Mikhail Cherkasov <mcherkas@openjdk.org>
Date: Mon, 15 May 2017 15:32:14 +0300
Subject: [PATCH] 8175915: NullPointerException from JComboBox and JList when
 Accessibility enabled

Reviewed-by: serb, prr
---
 .../com/sun/java/accessibility/internal/AccessBridge.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jdk/src/jdk.accessibility/windows/classes/com/sun/java/accessibility/internal/AccessBridge.java b/jdk/src/jdk.accessibility/windows/classes/com/sun/java/accessibility/internal/AccessBridge.java
index 7f3301612b9..305e267059a 100644
--- a/jdk/src/jdk.accessibility/windows/classes/com/sun/java/accessibility/internal/AccessBridge.java
+++ b/jdk/src/jdk.accessibility/windows/classes/com/sun/java/accessibility/internal/AccessBridge.java
@@ -702,7 +702,7 @@ final public class AccessBridge {
             }
 
             if (false == bExtendedSearch) {
-                debugString ("bk -- getVirtualAccessibleNameFromContext will not use the extended name search algorithm.  role = " + role.toDisplayString (Locale.US) );
+                debugString ("bk -- getVirtualAccessibleNameFromContext will not use the extended name search algorithm.  role = " + ( role != null ? role.toDisplayString(Locale.US) : "null") );
                 /*
                 Step 3:
                 =======