diff options
Diffstat (limited to 'libjava/classpath/javax/swing/InputMap.java')
| -rw-r--r-- | libjava/classpath/javax/swing/InputMap.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libjava/classpath/javax/swing/InputMap.java b/libjava/classpath/javax/swing/InputMap.java index cc65dfeed3e..28fccd9b9cd 100644 --- a/libjava/classpath/javax/swing/InputMap.java +++ b/libjava/classpath/javax/swing/InputMap.java @@ -190,8 +190,11 @@ public class InputMap Set set = new HashSet(); if (parent != null) - set.addAll(Arrays.asList(parent.allKeys())); - + { + Object[] parentKeys = parent.allKeys(); + if (parentKeys != null) + set.addAll(Arrays.asList(parentKeys)); + } set.addAll(inputMap.keySet()); if (set.size() == 0) return null; |
