tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From billbar...@apache.org
Subject cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/generators ErrorHandler.java
Date Sun, 21 Nov 2004 03:59:16 GMT
billbarker    2004/11/20 19:59:16

  Modified:    src/share/org/apache/tomcat/modules/generators
                        ErrorHandler.java
  Log:
  Change java.net.URL to o.a.t.u.net.URL.
  
  This is so that redirects to https:// works without requiring that JSSE is installed.
  
  Revision  Changes    Path
  1.31      +2 -2      jakarta-tomcat/src/share/org/apache/tomcat/modules/generators/ErrorHandler.java
  
  Index: ErrorHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/generators/ErrorHandler.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- ErrorHandler.java	25 Feb 2004 06:52:40 -0000	1.30
  +++ ErrorHandler.java	21 Nov 2004 03:59:16 -0000	1.31
  @@ -19,7 +19,6 @@
   import java.io.IOException;
   import java.lang.reflect.Method;
   import java.net.MalformedURLException;
  -import java.net.URL;
   import java.util.Locale;
   
   import org.apache.tomcat.core.BaseInterceptor;
  @@ -29,6 +28,7 @@
   import org.apache.tomcat.core.Request;
   import org.apache.tomcat.core.Response;
   import org.apache.tomcat.core.TomcatException;
  +import org.apache.tomcat.util.net.URL;
   import org.apache.tomcat.util.http.HttpMessages;
   import org.apache.tomcat.util.http.LocaleToCharsetMap;
   import org.apache.tomcat.util.log.Log;
  @@ -846,7 +846,7 @@
   	        return location;
   	    }
   	}
  -        return url.toString();
  +        return url.toExternalForm();
       }
   
       static String getRequestURL( Request req )  {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message