diff options
Diffstat (limited to 'libjava/javax/swing/ActionMap.java')
| -rw-r--r-- | libjava/javax/swing/ActionMap.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libjava/javax/swing/ActionMap.java b/libjava/javax/swing/ActionMap.java index 2a5c67a..9861591 100644 --- a/libjava/javax/swing/ActionMap.java +++ b/libjava/javax/swing/ActionMap.java @@ -86,8 +86,8 @@ public class ActionMap { Object result = actionMap.get(key); - if (result == null) - result = parent.get(key); + if (result == null && parent != null) + result = parent.get(key); return (Action) result; } |