ate 2005/05/25 16:46:46
Modified: portal/src/java/org/apache/jetspeed/velocity
JetspeedPowerTool.java
Log:
Check if path is already absolute before rewriting it as one
Revision Changes Path
1.46 +14 -6
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerTool.java
Index: JetspeedPowerTool.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerTool.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- JetspeedPowerTool.java 24 May 2005 02:10:58 -0000 1.45
+++ JetspeedPowerTool.java 25 May 2005 23:46:46 -0000 1.46
@@ -875,11 +875,19 @@
public String getAbsoluteUrl( String relativePath )
{
- HttpServletRequest request = getRequestContext().getRequest();
- StringBuffer path = new StringBuffer();
- return
renderResponse.encodeURL(path.append(request.getScheme()).append("://").append(request.getServerName()).append(":").append(
-
request.getServerPort()).append(request.getContextPath()).append(request.getServletPath()).append(
- relativePath).toString());
+ // only rewrite a non-absolute url
+ if ( relativePath != null && relativePath.indexOf("://") == -1)
+ {
+ HttpServletRequest request = getRequestContext().getRequest();
+ StringBuffer path = new StringBuffer();
+ return
renderResponse.encodeURL(path.append(request.getScheme()).append("://").append(request.getServerName()).append(":").append(
+
request.getServerPort()).append(request.getContextPath()).append(request.getServletPath()).append(
+ relativePath).toString());
+ }
+ else
+ {
+ return relativePath;
+ }
}
public Subject getSubject()
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
