From 48b274d12d9710336ae4f14352603fd4d783865d Mon Sep 17 00:00:00 2001 From: Frankie Wu Date: Sat, 19 Oct 2013 10:28:24 +0800 Subject: [PATCH] try to fix test failures by adding timezone support to PlainTestMessageCodec --- .../cat/message/spi/codec/PlainTextMessageCodec.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cat-client/src/main/java/com/dianping/cat/message/spi/codec/PlainTextMessageCodec.java b/cat-client/src/main/java/com/dianping/cat/message/spi/codec/PlainTextMessageCodec.java index 18f29463b..d682a3402 100644 --- a/cat-client/src/main/java/com/dianping/cat/message/spi/codec/PlainTextMessageCodec.java +++ b/cat-client/src/main/java/com/dianping/cat/message/spi/codec/PlainTextMessageCodec.java @@ -8,6 +8,7 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Stack; +import java.util.TimeZone; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; import java.util.concurrent.ConcurrentHashMap; @@ -463,6 +464,7 @@ public class PlainTextMessageCodec implements MessageCodec, LogEnabled { if (format == null) { format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); + format.setTimeZone(TimeZone.getTimeZone("GMT+8")); } try { @@ -481,7 +483,10 @@ public class PlainTextMessageCodec implements MessageCodec, LogEnabled { if (baseline == null) { try { - baseline = new SimpleDateFormat("yyyy-MM-dd").parse(date).getTime(); + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + + format.setTimeZone(TimeZone.getTimeZone("GMT+8")); + baseline = format.parse(date).getTime(); m_map.put(date, baseline); } catch (ParseException e) { return -1; -- GitLab