Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2414 from eclipse/jetty-9.4.x-issue-2413-server-timestamp 

Issue #2413 - Using Instant.toString() to be consistent with timestamp
This commit is contained in:
Joakim Erdfelt 2018-04-05 05:39:07 -05:00 committed by GitHub
parent 72404d15d6 ceded0bbae
commit 4d7ac53d7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jetty-util/src/main/java/org/eclipse/jetty/util/Jetty.java
View File

@ -18,14 +18,13 @@
package org.eclipse.jetty.util; package org.eclipse.jetty.util;
import java.io.InputStream;
import java.time.Instant;
import java.util.Properties;
import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.log.Logger;
import java.io.InputStream;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Properties;
public class Jetty public class Jetty
{ {
private static final Logger LOG = Log.getLogger( Jetty.class); private static final Logger LOG = Log.getLogger( Jetty.class);
@ -88,8 +87,8 @@ public class Jetty
{ {
try try
{ {
return new SimpleDateFormat( "yyyy-MM-dd'T'HH:mm:ssXXX" ) long epochMillis = Long.parseLong(timestamp);
.format( new Date( Long.valueOf( timestamp ) ) ); return Instant.ofEpochMilli(epochMillis).toString();
} }
catch ( NumberFormatException e ) catch ( NumberFormatException e )
{ {