aboutsummaryrefslogtreecommitdiff
path: root/libjava/javax/swing/InputMap.java
diff options
context:
space:
mode:
Diffstat (limited to 'libjava/javax/swing/InputMap.java')
-rw-r--r--libjava/javax/swing/InputMap.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/libjava/javax/swing/InputMap.java b/libjava/javax/swing/InputMap.java
index fdcc828..c737ae4 100644
--- a/libjava/javax/swing/InputMap.java
+++ b/libjava/javax/swing/InputMap.java
@@ -89,9 +89,9 @@ public class InputMap
{
Object result = inputMap.get(keystroke);
- if (result == null)
- result = parent.get(keystroke);
- return result;
+ if (result == null && parent != null)
+ result = parent.get(keystroke);
+ return result;
}
/**