From f7f3deedc812a79b33ba1abb66ce51c2cbe9abb6 Mon Sep 17 00:00:00 2001 From: Rainer Hermanns Date: Mon, 23 Jun 2008 12:31:51 +0000 Subject: [PATCH] WW-2878 portlet dispatching after action phase renders in wrong namespace git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@670542 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/struts2/portlet/result/PortletResult.java | 2 +- .../apache/struts2/portlet/result/PortletVelocityResult.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java index 1b8eb2e4b..1be221a18 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java @@ -142,7 +142,7 @@ public class PortletResult extends StrutsResultSupport implements PortletActionC // 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"); diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java index 3a08432d6..2a35d2727 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java @@ -138,7 +138,7 @@ public class PortletVelocityResult extends StrutsResultSupport { // 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");