portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
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 GMT
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



Mime
View raw message