This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 5fd108a Delete deprecated code marked for removal in Tomcat 10
5fd108a is described below
commit 5fd108ac62ca30001cde3ecaf0b48ae23a586d60
Author: Mark Thomas <[email protected]>
AuthorDate: Mon Jan 13 21:29:27 2020 +0000
Delete deprecated code marked for removal in Tomcat 10
---
java/org/apache/catalina/connector/Request.java | 37 ------------------------
java/org/apache/catalina/connector/Response.java | 10 -------
2 files changed, 47 deletions(-)
diff --git a/java/org/apache/catalina/connector/Request.java
b/java/org/apache/catalina/connector/Request.java
index 6cb160f..a4860d5 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -25,7 +25,6 @@ import java.io.UnsupportedEncodingException;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.security.Principal;
-import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -36,7 +35,6 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
-import java.util.TimeZone;
import java.util.TreeMap;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -138,11 +136,6 @@ public class Request implements HttpServletRequest {
*/
public Request(Connector connector) {
this.connector = connector;
-
- formats = new SimpleDateFormat[formatsTemplate.length];
- for(int i = 0; i < formats.length; i++) {
- formats[i] = (SimpleDateFormat) formatsTemplate[i].clone();
- }
}
@@ -177,13 +170,6 @@ public class Request implements HttpServletRequest {
// ----------------------------------------------------- Variables
/**
- * @deprecated Unused. This will be removed in Tomcat 10.
- */
- @Deprecated
- protected static final TimeZone GMT_ZONE = TimeZone.getTimeZone("GMT");
-
-
- /**
* The string manager for this package.
*/
protected static final StringManager sm =
StringManager.getManager(Request.class);
@@ -196,25 +182,6 @@ public class Request implements HttpServletRequest {
/**
- * The set of SimpleDateFormat formats to use in getDateHeader().
- *
- * Notice that because SimpleDateFormat is not thread-safe, we can't
- * declare formats[] as a static variable.
- *
- * @deprecated Unused. This will be removed in Tomcat 10
- */
- @Deprecated
- protected final SimpleDateFormat formats[];
-
- @Deprecated
- private static final SimpleDateFormat formatsTemplate[] = {
- new SimpleDateFormat(FastHttpDateFormat.RFC1123_DATE, Locale.US),
- new SimpleDateFormat("EEEEEE, dd-MMM-yy HH:mm:ss zzz", Locale.US),
- new SimpleDateFormat("EEE MMMM d HH:mm:ss yyyy", Locale.US)
- };
-
-
- /**
* The default Locale if none are specified.
*/
protected static final Locale defaultLocale = Locale.getDefault();
@@ -3514,9 +3481,5 @@ public class Request implements HttpServletRequest {
// NO-OP
}
});
-
- for (SimpleDateFormat sdf : formatsTemplate) {
- sdf.setTimeZone(GMT_ZONE);
- }
}
}
diff --git a/java/org/apache/catalina/connector/Response.java
b/java/org/apache/catalina/connector/Response.java
index f038343..70baffb 100644
--- a/java/org/apache/catalina/connector/Response.java
+++ b/java/org/apache/catalina/connector/Response.java
@@ -26,7 +26,6 @@ import java.security.AccessController;
import java.security.PrivilegedAction;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
-import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -91,15 +90,6 @@ public class Response implements HttpServletResponse {
// ----------------------------------------------------- Instance Variables
- /**
- * The date format we will use for creating date headers.
- *
- * @deprecated Unused. This will be removed in Tomcat 10
- */
- @Deprecated
- protected SimpleDateFormat format = null;
-
-
public Response() {
this(OutputBuffer.DEFAULT_BUFFER_SIZE);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
