You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by at...@apache.org on 2009/03/18 12:30:15 UTC
svn commit: r755558 -
/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/HttpServletPortletRequestWrapper.java
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<String> getAttributeNames()
{
- return portletRequest.getAttributeNames();
+ HashSet<String> names = new HashSet<String>();
+ Enumeration<String> 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