diff src/org/eclipse/jetty/server/Request.java @ 1013:6939226e0ac4

simplify URIUtil
author Franklin Schmidt <fschmidt@gmail.com>
date Mon, 24 Oct 2016 01:06:33 -0600
parents 39154cfa58e4
children 0114d373748e
line wrap: on
line diff
--- a/src/org/eclipse/jetty/server/Request.java	Mon Oct 24 00:47:24 2016 -0600
+++ b/src/org/eclipse/jetty/server/Request.java	Mon Oct 24 01:06:33 2016 -0600
@@ -146,7 +146,7 @@
 	private String _queryString;
 	private String _readerEncoding;
 	private String _requestURI;
-	private String _scheme = URIUtil.HTTP;
+	private String _scheme = "http";
 	private String _serverName;
 	private long _timeStamp;
 
@@ -613,7 +613,7 @@
 			url.append(scheme);
 			url.append("://");
 			url.append(getServerName());
-			if (_port > 0 && ((scheme.equalsIgnoreCase(URIUtil.HTTP) && port != 80) || (scheme.equalsIgnoreCase(URIUtil.HTTPS) && port != 443)))
+			if (_port > 0 && ((scheme.equalsIgnoreCase("http") && port != 80) || (scheme.equalsIgnoreCase("https") && port != 443)))
 			{
 				url.append(':');
 				url.append(_port);
@@ -753,7 +753,7 @@
 
 		if (_port <= 0)
 		{
-			if (getScheme().equalsIgnoreCase(URIUtil.HTTPS))
+			if (getScheme().equalsIgnoreCase("https"))
 				return 443;
 			return 80;
 		}
@@ -882,7 +882,7 @@
 		_protocol = HttpVersions.HTTP_1_1;
 		_queryString = null;
 		_requestURI = null;
-		_scheme = URIUtil.HTTP;
+		_scheme = "http";
 		_timeStamp = 0;
 		_uri = null;
 		if (_baseParameters != null)