billbarker 2002/12/04 22:42:35
Modified: src/facade22/org/apache/tomcat/facade
HttpServletResponseFacade.java
Log:
Port patch for encoding an empty string from TC4 branch.
Revision Changes Path
1.30 +17 -7
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpServletResponseFacade.java
Index: HttpServletResponseFacade.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/HttpServletResponseFacade.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- HttpServletResponseFacade.java 4 Jul 2002 04:09:30 -0000 1.29
+++ HttpServletResponseFacade.java 5 Dec 2002 06:42:35 -0000 1.30
@@ -142,10 +142,15 @@
* part of response, but session code.
*/
public String encodeRedirectURL(String location) {
- if (isEncodeable(toAbsolute(location)))
+ String absolute = toAbsolute(location);
+ if (isEncodeable(absolute)) {
+ if( "".equals(location) ) {
+ location = absolute;
+ }
return (toEncoded(location, response.getRequest().getSession(false)));
- else
+ } else {
return (location);
+ }
}
/**
@@ -156,10 +161,15 @@
}
public String encodeURL(String url) {
- if (isEncodeable(toAbsolute(url)))
+ String absolute = toAbsolute(url);
+ if (isEncodeable(absolute)) {
+ if( "".equals(url) ) {
+ url = absolute;
+ }
return (toEncoded(url, response.getRequest().getSession(false)));
- else
+ } else {
return (url);
+ }
}
/**
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
