浏览代码

Merge pull request #154 from ShaneMcC/master

Fix handling of MessageTags times when we are not at UTC.
pull/155/head
Greg Holmes 7 年前
父节点
当前提交
6aee34dd8e
共有 1 个文件被更改,包括 2 次插入0 次删除
  1. 2
    0
      irc/src/main/java/com/dmdirc/parser/irc/IRCParser.java

+ 2
- 0
irc/src/main/java/com/dmdirc/parser/irc/IRCParser.java 查看文件

@@ -62,6 +62,7 @@ import java.security.SecureRandom;
62 62
 import java.time.Instant;
63 63
 import java.time.LocalDateTime;
64 64
 import java.time.ZoneId;
65
+import java.time.ZoneOffset;
65 66
 import java.time.format.DateTimeFormatter;
66 67
 import java.time.format.DateTimeParseException;
67 68
 import java.util.ArrayList;
@@ -1133,6 +1134,7 @@ public class IRCParser extends BaseSocketAwareParser implements SecureParser, En
1133 1134
             try {
1134 1135
                 lineTS = LocalDateTime.parse(line.getTags().get("time"),
1135 1136
                         DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"));
1137
+                lineTS = lineTS.atOffset(ZoneOffset.UTC).atZoneSameInstant(ZoneId.systemDefault()).toLocalDateTime();
1136 1138
             } catch (final DateTimeParseException pe) { /* Do nothing. */ }
1137 1139
         }
1138 1140
 

正在加载...
取消
保存