Replace GMT with history server side TimeZone.

apache · Nov 2, 2017 · 17bddef · 17bddef
1 parent b04eefa
commit 17bddef
Showing 1 changed file with 4 additions and 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
@@ -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, Locale, 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 timeZone = TimeZone.getDefault
+    val iso8601 = new SimpleDateFormat(s"yyyy-MM-dd'T'HH:mm:ss.SSS'${timeZone.getID}'", Locale.US)
+    val cal = Calendar.getInstance(timeZone)
     iso8601.setCalendar(cal)
     iso8601
   }