Author: nilsga
Date: Mon Sep 10 12:55:07 2007
New Revision: 574349

URL: http://svn.apache.org/viewvc?rev=574349&view=rev
Log:
WW-2164 Backport to 2.0.x branch for error in url when namespace is blank.

Modified:
    
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java

Modified: 
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java?rev=574349&r1=574348&r2=574349&view=diff
==============================================================================
--- 
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java
 (original)
+++ 
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java
 Mon Sep 10 12:55:07 2007
@@ -108,12 +108,12 @@
             if(!action.startsWith("/") && !namespace.endsWith("/")) {
                 resultingAction.append("/");
             }
-            resultingAction.append(action);
-            LOG.debug("Resulting actionPath: " + action);
         }
+        resultingAction.append(action);
         if(TextUtils.stringSet(method)) {
                resultingAction.append("!").append(method);
         }
+        LOG.debug("Resulting actionPath: " + resultingAction);
         params.put(PortletActionConstants.ACTION_PARAM, new String[] { 
resultingAction.toString() });
 
         PortletURL url = null;


Reply via email to