1 files changed, 7 insertions, 2 deletions
diff --git a/libjava/classpath/javax/swing/ActionMap.java b/libjava/classpath/javax/swing/ActionMap.java
index c14bafdb4be..65e193d2e79 100644
--- a/libjava/classpath/javax/swing/ActionMap.java
+++ b/libjava/classpath/javax/swing/ActionMap.java
@@ -80,6 +80,7 @@ public class ActionMap
    */
   public ActionMap()
   {
+    // Nothing to do here.
   }
 
   /**
@@ -170,7 +171,9 @@ public class ActionMap
    */
   public Object[] keys()
   {
-    return actionMap.keySet().toArray();
+    if (size() != 0)
+      return actionMap.keySet().toArray();
+    return null;
   }
 
   /**
@@ -187,7 +190,9 @@ public class ActionMap
       set.addAll(Arrays.asList(parent.allKeys()));
 
     set.addAll(actionMap.keySet());
-    return set.toArray();
+    if (set.size() != 0)
+      return set.toArray();
+    return null;
   }
 
   /**