From 3b3101d8b5ae4f08a16c0b7111da6cad41bbd282 Mon Sep 17 00:00:00 2001
From: mark <mark@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 15 Nov 2005 23:20:01 +0000
Subject:        Imported GNU Classpath 0.19 + gcj-import-20051115.        *
 sources.am: Regenerated.        * Makefile.in: Likewise.        *
 scripts/makemake.tcl: Use glob -nocomplain.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@107049 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libjava/classpath/javax/swing/ActionMap.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'libjava/classpath/javax/swing/ActionMap.java')

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;
   }
 
   /**
-- 
cgit v1.2.1