diff options
| -rw-r--r-- | src/org/traccar/database/MediaManager.java | 2 | ||||
| -rw-r--r-- | src/org/traccar/protocol/TelemaxProtocolDecoder.java | 2 | ||||
| -rw-r--r-- | test/org/traccar/calendar/CalendarTest.java | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/org/traccar/database/MediaManager.java b/src/org/traccar/database/MediaManager.java index 0bb6afac7..eb23d162f 100644 --- a/src/org/traccar/database/MediaManager.java +++ b/src/org/traccar/database/MediaManager.java @@ -49,7 +49,7 @@ public class MediaManager { public String writeFile(String uniqueId, ByteBuf buf, String extension) { if (path != null) { int size = buf.readableBytes(); - String name = new SimpleDateFormat("yyyyMMddhhmmss").format(new Date()) + "." + extension; + String name = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + "." + extension; try (FileOutputStream output = new FileOutputStream(createFile(uniqueId, name)); FileChannel fileChannel = output.getChannel()) { ByteBuffer byteBuffer = buf.nioBuffer(); diff --git a/src/org/traccar/protocol/TelemaxProtocolDecoder.java b/src/org/traccar/protocol/TelemaxProtocolDecoder.java index fd2f03e1c..5eb5ca0b5 100644 --- a/src/org/traccar/protocol/TelemaxProtocolDecoder.java +++ b/src/org/traccar/protocol/TelemaxProtocolDecoder.java @@ -93,7 +93,7 @@ public class TelemaxProtocolDecoder extends BaseProtocolDecoder { position.setLatitude((Integer.parseInt(readValue(sentence, index, 6), 16) - 5400000) / 30000.0); if (i == 0 | i == count - 1) { - time = new SimpleDateFormat("yyMMddhhmmss").parse(readValue(sentence, index, 12)); + time = new SimpleDateFormat("yyMMddHHmmss").parse(readValue(sentence, index, 12)); position.set(Position.KEY_STATUS, readValue(sentence, index, 8)); } else { time = new Date(time.getTime() + interval * 1000); diff --git a/test/org/traccar/calendar/CalendarTest.java b/test/org/traccar/calendar/CalendarTest.java index 0de89f97f..56406d4b8 100644 --- a/test/org/traccar/calendar/CalendarTest.java +++ b/test/org/traccar/calendar/CalendarTest.java @@ -44,7 +44,7 @@ public class CalendarTest { "END:VCALENDAR"; Calendar calendar = new Calendar(); calendar.setData(calendarString.getBytes()); - DateFormat format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ssX"); + DateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ssX"); Date date = format.parse("2016-12-13 22:59:59+05"); assertTrue(!calendar.checkMoment(date)); |