Author: nilsga
Date: Sun Apr 26 21:34:14 2009
New Revision: 768802
URL: http://svn.apache.org/viewvc?rev=768802&view=rev
Log:
WW-3087 Using session to store location.
Modified:
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java
Modified:
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java?rev=768802&r1=768801&r2=768802&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java
(original)
+++
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java
Sun Apr 26 21:34:14 2009
@@ -51,7 +51,7 @@
/**
*/
-public class PortletFreemarkerResult extends StrutsResultSupport {
+public class PortletFreemarkerResult extends StrutsResultSupport implements
PortletActionConstants{
private static final long serialVersionUID = -5570612389289887543L;
@@ -120,8 +120,8 @@
ActionInvocation invocation) {
ActionResponse res = PortletActionContext.getActionResponse();
// View is rendered outside an action...uh oh...
+
invocation.getInvocationContext().getSession().put(RENDER_DIRECT_LOCATION,
location);
res.setRenderParameter(PortletActionConstants.ACTION_PARAM,
"freemarkerDirect");
- res.setRenderParameter("location", location);
res.setRenderParameter(PortletActionConstants.MODE_PARAM,
PortletActionContext
.getRequest().getPortletMode().toString());