Return-Path: Delivered-To: apmail-portals-pluto-scm-archive@www.apache.org Received: (qmail 44077 invoked from network); 18 Mar 2009 11:30:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 18 Mar 2009 11:30:39 -0000 Received: (qmail 55067 invoked by uid 500); 18 Mar 2009 11:30:39 -0000 Delivered-To: apmail-portals-pluto-scm-archive@portals.apache.org Received: (qmail 55013 invoked by uid 500); 18 Mar 2009 11:30:38 -0000 Mailing-List: contact pluto-scm-help@portals.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list pluto-scm@portals.apache.org Received: (qmail 55004 invoked by uid 99); 18 Mar 2009 11:30:38 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Mar 2009 04:30:38 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Mar 2009 11:30:36 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id AACD223888EB; Wed, 18 Mar 2009 11:30:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r755558 - /portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/HttpServletPortletRequestWrapper.java Date: Wed, 18 Mar 2009 11:30:15 -0000 To: pluto-scm@portals.apache.org From: ate@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090318113015.AACD223888EB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ate Date: Wed Mar 18 11:30:15 2009 New Revision: 755558 URL: http://svn.apache.org/viewvc?rev=755558&view=rev Log: need to merge current (container or further wrapped) request attribute names with the portlet provided attributes Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/HttpServletPortletRequestWrapper.java Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/HttpServletPortletRequestWrapper.java URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/HttpServletPortletRequestWrapper.java?rev=755558&r1=755557&r2=755558&view=diff ============================================================================== --- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/HttpServletPortletRequestWrapper.java (original) +++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/HttpServletPortletRequestWrapper.java Wed Mar 18 11:30:15 2009 @@ -521,10 +521,21 @@ return value != null ? value : portletRequest.getAttribute(name); } + @SuppressWarnings("unchecked") @Override public Enumeration getAttributeNames() { - return portletRequest.getAttributeNames(); + HashSet names = new HashSet(); + Enumeration e; + for (e = getRequest().getAttributeNames(); e.hasMoreElements(); ) + { + names.add(e.nextElement()); + } + for (e = portletRequest.getAttributeNames(); e.hasMoreElements(); ) + { + names.add(e.nextElement()); + } + return Collections.enumeration(names); } @Override