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 dd...@apache.org on 2006/12/06 02:42:22 UTC

svn commit: r482862 - /portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortalServletRequest.java

Author: ddewolf
Date: Tue Dec  5 17:42:18 2006
New Revision: 482862

URL: http://svn.apache.org/viewvc?view=rev&rev=482862
Log:
Cleaning up evaluation which is always true to express the original intent. PLUTO-261

Modified:
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortalServletRequest.java

Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortalServletRequest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortalServletRequest.java?view=diff&rev=482862&r1=482861&r2=482862
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortalServletRequest.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortalServletRequest.java Tue Dec  5 17:42:18 2006
@@ -27,9 +27,13 @@
 import org.apache.pluto.PortletWindow;
 import org.apache.pluto.driver.url.PortalURLParameter;
 import org.apache.pluto.driver.url.PortalURL;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 public class PortalServletRequest extends HttpServletRequestWrapper {
 
+    private static final Log LOG = LogFactory.getLog(PortalServletRequest.class);
+
     private PortletWindow portletWindow = null;
 
     private PortalURL url;
@@ -92,7 +96,11 @@
             }
         }
 
-        String id = portletWindow.getId().getStringId();
+        // Currently this request is only used for rendering.
+        // Because of that, this will never be used, however, it's
+        // being left in since this request's scope may expand at some
+        // point!
+        String id = url.getActionWindow();
         if (portletWindow.getId().getStringId().equals(id)) {
             Enumeration params = super.getParameterNames();
             while (params.hasMoreElements()) {
@@ -106,6 +114,11 @@
                 }
                 portletParameters.put(name, values);
             }
+        }
+
+        if(LOG.isDebugEnabled()) {
+            LOG.debug("Initialized request parameter map for window: '"
+                +portletWindow.getId().getStringId()+"'");
         }
     }