From 7c80d96fa6c1dcea07eec56363a115a9f145e6eb Mon Sep 17 00:00:00 2001 From: Johnson Zhang Date: Fri, 6 Jan 2017 14:44:34 +0800 Subject: [PATCH] correct the wrong time display in history server web UI --- .../apache/spark/status/api/v1/JacksonMessageWriter.scala | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core/src/main/scala/org/apache/spark/status/api/v1/JacksonMessageWriter.scala b/core/src/main/scala/org/apache/spark/status/api/v1/JacksonMessageWriter.scala index 76af33c1a18db..a1a0596e3f2d7 100644 --- a/core/src/main/scala/org/apache/spark/status/api/v1/JacksonMessageWriter.scala +++ b/core/src/main/scala/org/apache/spark/status/api/v1/JacksonMessageWriter.scala @@ -21,7 +21,7 @@ import java.lang.annotation.Annotation import java.lang.reflect.Type import java.nio.charset.StandardCharsets import java.text.SimpleDateFormat -import java.util.{Calendar, Locale, SimpleTimeZone} +import java.util.{Calendar, SimpleTimeZone, TimeZone} import javax.ws.rs.Produces import javax.ws.rs.core.{MediaType, MultivaluedMap} import javax.ws.rs.ext.{MessageBodyWriter, Provider} @@ -86,8 +86,9 @@ private[v1] class JacksonMessageWriter extends MessageBodyWriter[Object]{ private[spark] object JacksonMessageWriter { def makeISODateFormat: SimpleDateFormat = { - val iso8601 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'GMT'", Locale.US) - val cal = Calendar.getInstance(new SimpleTimeZone(0, "GMT")) + val iso8601 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'GMT'") + val offset: Int = TimeZone.getDefault.getRawOffset + val cal = Calendar.getInstance(new SimpleTimeZone(offset, "GMT")) iso8601.setCalendar(cal) iso8601 }