Author: taylor
Date: Wed Jan 3 22:57:08 2007
New Revision: 492431
URL: http://svn.apache.org/viewvc?view=rev&rev=492431
Log:
https://issues.apache.org/jira/browse/PB-52
JSF portal bridge attempting to encode URL twice fails
seems to work in my testing here with MyFaces
let me know if it causes problems with Sun ref impl
Modified:
portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/PortletExternalContextImpl.java
Modified:
portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/PortletExternalContextImpl.java
URL:
http://svn.apache.org/viewvc/portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/PortletExternalContextImpl.java?view=diff&rev=492431&r1=492430&r2=492431
==============================================================================
---
portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/PortletExternalContextImpl.java
(original)
+++
portals/bridges/trunk/jsf/src/java/org/apache/portals/bridges/jsf/PortletExternalContextImpl.java
Wed Jan 3 22:57:08 2007
@@ -366,8 +366,14 @@
*/
public String encodeActionURL(String s)
{
- return s;
- // return this.portletResponse.encodeURL(s);
+ if (null != s)
+ {
+ if (s.startsWith("http") || s.startsWith("http") ||
(s.startsWith("/")))
+ {
+ return this.portletResponse.encodeURL(s);
+ }
+ }
+ return s;
}
/**
@@ -375,12 +381,14 @@
*/
public String encodeResourceURL(String s)
{
- if ((null != s) && (!s.startsWith("http") && (!s.startsWith("/"))))
+ if (null != s)
{
- s = "/" + s;
+ if (s.startsWith("http") || s.startsWith("http") ||
(s.startsWith("/")))
+ {
+ return this.portletResponse.encodeURL(s);
+ }
}
- return s;
- // return this.portletResponse.encodeURL(s);
+ return s;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
