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 cd...@apache.org on 2008/10/08 13:20:16 UTC
svn commit: r702808 -
/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverFilter.java
Author: cdoremus
Date: Wed Oct 8 04:20:16 2008
New Revision: 702808
URL: http://svn.apache.org/viewvc?rev=702808&view=rev
Log:
Applied patch submitted in PLUTO_507. Thanks Brian!
Modified:
portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverFilter.java
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverFilter.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverFilter.java?rev=702808&r1=702807&r2=702808&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverFilter.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverFilter.java Wed Oct 8 04:20:16 2008
@@ -38,7 +38,9 @@
import java.io.IOException;
/**
- * The controller filter used to drive static portlet pages.
+ * The controller filter used to drive static portlet pages (see
+ * <a href="http://portals.apache.org/pluto/faq.html#simple-embed">
+ * http://portals.apache.org/pluto/faq.html#simple-embed</a> in Pluto FAQ).
*
* @version 1.0
* @since March 28, 2006
@@ -104,11 +106,10 @@
// filter dispatchers. B/C of this, we make sure we haven't
// allready processed this request. No infinite loops for us!!!!
if (PortalRequestContext.getContext(req) == null) {
- PortalRequestContext ctx = doPortletPrepare(req, (HttpServletResponse) response);
- LOG.debug("Render Path: " + ctx.getRequestedPortalURL().getRenderPath());
- LOG.debug("Servlet Path: " + ctx.getRequestedPortalURL().getServletPath());
- PortalURL url = ctx.getRequestedPortalURL();
- if (url.getActionWindow() != null) {
+ boolean actionRequestProcessed =
+ doPortletPrepare(req, (HttpServletResponse) response);
+
+ if (actionRequestProcessed) {
return;
}
@@ -136,10 +137,16 @@
* @param response
* @throws java.io.IOException if an io exception occurs
* @throws javax.servlet.ServletException if a servlet exception occurs
+ * @return A boolean flag indicating whether or not an action request was
+ * processed. A value of true indicates than an action request was
+ * processed while a value of false indicates that an action request was
+ * NOT processed.
*/
- public PortalRequestContext doPortletPrepare(HttpServletRequest request, HttpServletResponse response)
+ public boolean doPortletPrepare(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException {
+ boolean actionRequestProcessed = false;
+
PortalRequestContext portalRequestContext =
new PortalRequestContext(getServletContext(), request, response);
@@ -169,8 +176,15 @@
if (LOG.isDebugEnabled()) {
LOG.debug("Action request processed.\n\n");
}
+
+ actionRequestProcessed = true;
+ }
+
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Render Path: " + portalURL.getRenderPath());
+ LOG.debug("Servlet Path: " + portalURL.getServletPath());
}
- return portalRequestContext;
+ return actionRequestProcessed;
}
}