You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by he...@apache.org on 2008/06/23 14:31:52 UTC
svn commit: r670542 - in
/struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/result:
PortletResult.java PortletVelocityResult.java
Author: hermanns
Date: Mon Jun 23 05:31:51 2008
New Revision: 670542
URL: http://svn.apache.org/viewvc?rev=670542&view=rev
Log:
WW-2878 portlet dispatching after action phase renders in wrong namespace
Modified:
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java
struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java
Modified: struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java?rev=670542&r1=670541&r2=670542&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java (original)
+++ struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java Mon Jun 23 05:31:51 2008
@@ -142,7 +142,7 @@
// View is rendered outside an action...uh oh...
String namespace = invocation.getProxy().getNamespace();
if ( namespace != null && namespace.length() > 0 && !namespace.endsWith("/")) {
- namespace += namespace + "/";
+ namespace += "/";
}
res.setRenderParameter(ACTION_PARAM, namespace + "renderDirect");
Modified: struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java?rev=670542&r1=670541&r2=670542&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java (original)
+++ struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java Mon Jun 23 05:31:51 2008
@@ -138,7 +138,7 @@
// View is rendered outside an action...uh oh...
String namespace = invocation.getProxy().getNamespace();
if ( namespace != null && namespace.length() > 0 && !namespace.endsWith("/")) {
- namespace += namespace + "/";
+ namespace += "/";
}
res.setRenderParameter(PortletActionConstants.ACTION_PARAM, namespace + "freemarkerDirect");