Browse Source

Merge pull request #135 from csmith/timestamps

Fix tsirc timezone handling.
pull/136/head
Greg Holmes 8 years ago
parent
commit
c29e9b98bb
1 changed files with 4 additions and 2 deletions
  1. 4
    2
      irc/src/main/java/com/dmdirc/parser/irc/IRCParser.java

+ 4
- 2
irc/src/main/java/com/dmdirc/parser/irc/IRCParser.java View File

59
 import java.security.KeyManagementException;
59
 import java.security.KeyManagementException;
60
 import java.security.NoSuchAlgorithmException;
60
 import java.security.NoSuchAlgorithmException;
61
 import java.security.SecureRandom;
61
 import java.security.SecureRandom;
62
+import java.time.Instant;
62
 import java.time.LocalDateTime;
63
 import java.time.LocalDateTime;
63
-import java.time.ZoneOffset;
64
+import java.time.ZoneId;
64
 import java.time.format.DateTimeFormatter;
65
 import java.time.format.DateTimeFormatter;
65
 import java.time.format.DateTimeParseException;
66
 import java.time.format.DateTimeParseException;
66
 import java.util.ArrayList;
67
 import java.util.ArrayList;
1114
         if (line.getTags().containsKey("tsirc date")) {
1115
         if (line.getTags().containsKey("tsirc date")) {
1115
             try {
1116
             try {
1116
                 final long ts = Long.parseLong(line.getTags().get("tsirc date")) - tsdiff;
1117
                 final long ts = Long.parseLong(line.getTags().get("tsirc date")) - tsdiff;
1117
-                lineTS = LocalDateTime.ofEpochSecond(ts / 1000L, (int) (ts % 1000L), ZoneOffset.UTC);
1118
+                lineTS = LocalDateTime.ofInstant(Instant.ofEpochSecond(ts / 1000L, (int) (ts % 1000L)),
1119
+                        ZoneId.systemDefault());
1118
             } catch (final NumberFormatException nfe) { /* Do nothing. */ }
1120
             } catch (final NumberFormatException nfe) { /* Do nothing. */ }
1119
         } else if (line.getTags().containsKey("time")) {
1121
         } else if (line.getTags().containsKey("time")) {
1120
             try {
1122
             try {

Loading…
Cancel
Save