Author: markt
Date: Wed Jun 20 14:29:45 2018
New Revision: 1833918
URL: http://svn.apache.org/viewvc?rev=1833918&view=rev
Log:
Simplify
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java?rev=1833918&r1=1833917&r2=1833918&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
Wed Jun 20 14:29:45 2018
@@ -19,13 +19,10 @@ package org.apache.catalina.authenticato
import java.io.IOException;
import java.security.Principal;
import java.security.cert.X509Certificate;
-import java.text.SimpleDateFormat;
import java.util.Date;
-import java.util.Locale;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
-import java.util.TimeZone;
import javax.security.auth.Subject;
import javax.security.auth.callback.CallbackHandler;
@@ -58,6 +55,7 @@ import org.apache.catalina.authenticator
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;
@@ -67,7 +65,6 @@ import org.apache.juli.logging.LogFactor
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;
/**
@@ -96,12 +93,7 @@ public abstract class AuthenticatorBase
/**
* "Expires" header always set to Date(1), so generate once only
*/
- private static final String DATE_ONE;
- static {
- SimpleDateFormat format = new
SimpleDateFormat(FastHttpDateFormat.RFC1123_DATE, Locale.US);
- format.setTimeZone(TimeZone.getTimeZone("GMT"));
- DATE_ONE = format.format(new Date(1));
- }
+ private static final String DATE_ONE =
ConcurrentDateFormat.formatRfc1123(new Date(1));
/**
* The string manager for this package.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
