Skip to content

Commit 17bddef

Browse files
committed
Replace GMT with history server side TimeZone.
1 parent b04eefa commit 17bddef

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

core/src/main/scala/org/apache/spark/status/api/v1/JacksonMessageWriter.scala

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import java.lang.annotation.Annotation
2121
import java.lang.reflect.Type
2222
import java.nio.charset.StandardCharsets
2323
import java.text.SimpleDateFormat
24-
import java.util.{Calendar, Locale, SimpleTimeZone}
24+
import java.util.{Calendar, Locale, TimeZone}
2525
import javax.ws.rs.Produces
2626
import javax.ws.rs.core.{MediaType, MultivaluedMap}
2727
import javax.ws.rs.ext.{MessageBodyWriter, Provider}
@@ -86,8 +86,9 @@ private[v1] class JacksonMessageWriter extends MessageBodyWriter[Object]{
8686

8787
private[spark] object JacksonMessageWriter {
8888
def makeISODateFormat: SimpleDateFormat = {
89-
val iso8601 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'GMT'", Locale.US)
90-
val cal = Calendar.getInstance(new SimpleTimeZone(0, "GMT"))
89+
val timeZone = TimeZone.getDefault
90+
val iso8601 = new SimpleDateFormat(s"yyyy-MM-dd'T'HH:mm:ss.SSS'${timeZone.getID}'", Locale.US)
91+
val cal = Calendar.getInstance(timeZone)
9192
iso8601.setCalendar(cal)
9293
iso8601
9394
}

0 commit comments

Comments
 (0)