changeset 10781:9ef0071d0e24

8078408: Java version applet hangs with Voice over turned on Summary: add null check to fix NPE Reviewed-by: prr, serb, alexsch Contributed-by: peter.brunet@oracle.com
author ptbrunet
date Tue, 26 May 2015 13:42:41 -0500
parents 5526c1d714c2
children 2835902cca77
files src/macosx/classes/sun/lwawt/macosx/CAccessibility.java
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/macosx/classes/sun/lwawt/macosx/CAccessibility.java	Tue May 26 10:00:55 2015 -0700
+++ b/src/macosx/classes/sun/lwawt/macosx/CAccessibility.java	Tue May 26 13:42:41 2015 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -630,7 +630,7 @@
 
             if (!allowIgnored) {
                 final AccessibleRole role = context.getAccessibleRole();
-                if (role != null && ignoredRoles.contains(roleKey(role))) {
+                if (role != null && ignoredRoles != null && ignoredRoles.contains(roleKey(role))) {
                     // Get the child's unignored children.
                     _addChildren(child, whichChildren, false, childrenAndRoles);
                 } else {