This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 111f0d1b952e5c6f428fd809e5978a75be57c8c7
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jul 29 20:34:15 2019 +0100
Align with master. Deprecate
Use org.apache.tomcat.util.http.ConcurrentDateFormat instead
---
java/org/apache/catalina/authenticator/AuthenticatorBase.java | 5 ++---
java/org/apache/catalina/servlets/WebdavServlet.java | 2 +-
java/org/apache/catalina/util/ConcurrentDateFormat.java | 4 ++++
java/org/apache/catalina/webresources/AbstractResource.java | 6 +++---
4 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
index 6c0e5b2..d505c28 100644
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -19,7 +19,6 @@ package org.apache.catalina.authenticator;
import java.io.IOException;
import java.security.Principal;
import java.security.cert.X509Certificate;
-import java.util.Date;
import java.util.Map;
import java.util.Set;
@@ -55,7 +54,6 @@ import
org.apache.catalina.authenticator.jaspic.MessageInfoImpl;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.catalina.realm.GenericPrincipal;
-import org.apache.catalina.util.ConcurrentDateFormat;
import org.apache.catalina.util.SessionIdGeneratorBase;
import org.apache.catalina.util.StandardSessionIdGenerator;
import org.apache.catalina.valves.ValveBase;
@@ -65,6 +63,7 @@ import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.descriptor.web.LoginConfig;
import org.apache.tomcat.util.descriptor.web.SecurityConstraint;
+import org.apache.tomcat.util.http.FastHttpDateFormat;
import org.apache.tomcat.util.res.StringManager;
/**
@@ -93,7 +92,7 @@ public abstract class AuthenticatorBase extends ValveBase
/**
* "Expires" header always set to Date(1), so generate once only
*/
- private static final String DATE_ONE =
ConcurrentDateFormat.formatRfc1123(new Date(1));
+ private static final String DATE_ONE = FastHttpDateFormat.formatDate(1);
private static final AuthConfigProvider NO_PROVIDER_AVAILABLE = new
NoOpAuthConfigProvider();
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index f820e7e..4c59ac2 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -43,11 +43,11 @@ import javax.xml.parsers.ParserConfigurationException;
import org.apache.catalina.WebResource;
import org.apache.catalina.connector.RequestFacade;
-import org.apache.catalina.util.ConcurrentDateFormat;
import org.apache.catalina.util.DOMWriter;
import org.apache.catalina.util.URLEncoder;
import org.apache.catalina.util.XMLWriter;
import org.apache.tomcat.util.buf.UDecoder;
+import org.apache.tomcat.util.http.ConcurrentDateFormat;
import org.apache.tomcat.util.http.FastHttpDateFormat;
import org.apache.tomcat.util.http.RequestUtil;
import org.apache.tomcat.util.security.ConcurrentMessageDigest;
diff --git a/java/org/apache/catalina/util/ConcurrentDateFormat.java
b/java/org/apache/catalina/util/ConcurrentDateFormat.java
index 4042b95..7408938 100644
--- a/java/org/apache/catalina/util/ConcurrentDateFormat.java
+++ b/java/org/apache/catalina/util/ConcurrentDateFormat.java
@@ -27,7 +27,11 @@ import java.util.concurrent.ConcurrentLinkedQueue;
* A thread safe wrapper around {@link SimpleDateFormat} that does not make use
* of ThreadLocal and - broadly - only creates enough SimpleDateFormat objects
* to satisfy the concurrency requirements.
+ *
+ * @deprecated Unused. This will be removed in Tomcat 10.
+ * Use {@link org.apache.tomcat.util.http.ConcurrentDateFormat}
*/
+@Deprecated
public class ConcurrentDateFormat {
private final String format;
diff --git a/java/org/apache/catalina/webresources/AbstractResource.java
b/java/org/apache/catalina/webresources/AbstractResource.java
index 4160a96..ad6e8b2 100644
--- a/java/org/apache/catalina/webresources/AbstractResource.java
+++ b/java/org/apache/catalina/webresources/AbstractResource.java
@@ -17,12 +17,11 @@
package org.apache.catalina.webresources;
import java.io.InputStream;
-import java.util.Date;
import org.apache.catalina.WebResource;
import org.apache.catalina.WebResourceRoot;
-import org.apache.catalina.util.ConcurrentDateFormat;
import org.apache.juli.logging.Log;
+import org.apache.tomcat.util.http.FastHttpDateFormat;
import org.apache.tomcat.util.res.StringManager;
public abstract class AbstractResource implements WebResource {
@@ -56,9 +55,10 @@ public abstract class AbstractResource implements
WebResource {
@Override
public final String getLastModifiedHttp() {
- return ConcurrentDateFormat.formatRfc1123(new Date(getLastModified()));
+ return FastHttpDateFormat.formatDate(getLastModified());
}
+
@Override
public final String getETag() {
if (weakETag == null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
