Return-Path: Delivered-To: apmail-jakarta-jetspeed-dev-archive@www.apache.org Received: (qmail 68618 invoked from network); 28 Aug 2004 20:02:40 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 28 Aug 2004 20:02:40 -0000 Received: (qmail 979 invoked by uid 500); 28 Aug 2004 20:02:38 -0000 Delivered-To: apmail-jakarta-jetspeed-dev-archive@jakarta.apache.org Received: (qmail 925 invoked by uid 500); 28 Aug 2004 20:02:38 -0000 Mailing-List: contact jetspeed-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Jetspeed Developers List" Reply-To: "Jetspeed Developers List" Delivered-To: mailing list jetspeed-dev@jakarta.apache.org Received: (qmail 904 invoked by uid 500); 28 Aug 2004 20:02:38 -0000 Received: (qmail 899 invoked by uid 99); 28 Aug 2004 20:02:38 -0000 X-ASF-Spam-Status: No, hits=-2.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.27.1) with SMTP; Sat, 28 Aug 2004 13:02:36 -0700 Received: (qmail 68583 invoked by uid 1688); 28 Aug 2004 20:02:36 -0000 Date: 28 Aug 2004 20:02:36 -0000 Message-ID: <20040828200236.68582.qmail@minotaur.apache.org> From: jford@apache.org To: jakarta-jetspeed-cvs@apache.org Subject: cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets GenericMVCContext.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N jford 2004/08/28 13:02:36 Modified: src/java/org/apache/jetspeed/portal/portlets GenericMVCContext.java Log: Fixed getKeys() to return all keys. PR: JIRA #JS1-508 Revision Changes Path 1.3 +6 -3 jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/GenericMVCContext.java Index: GenericMVCContext.java =================================================================== RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/GenericMVCContext.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- GenericMVCContext.java 23 Feb 2004 04:03:33 -0000 1.2 +++ GenericMVCContext.java 28 Aug 2004 20:02:35 -0000 1.3 @@ -128,7 +128,11 @@ public Object[] getKeys() { + HashSet allKeys = new HashSet(); + Set keySet = data.keySet(); + + allKeys.addAll(keySet); Iterator itr = additionalContexts.iterator(); @@ -137,17 +141,16 @@ Object[] keys = ((Context) itr.next()).getKeys(); for (int i = 0; i < keys.length; i++) { - keySet.add(keys[i]); + allKeys.add(keys[i]); } } // (Object[])java.lang.reflect.Array.newInstance((new Object()).getClass(),2); - return data.keySet().toArray(); + return allKeys.toArray(); } public Object put(java.lang.String key, java.lang.Object value) { - return data.put(key, value); } --------------------------------------------------------------------- To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org