From c42539d4eca66e609c9bd62b09079f13f443ba30 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Wed, 25 Apr 2018 12:00:11 +0200 Subject: [PATCH] fixed time point parsing for Expedition files that have certain time columns but without values Change-Id: Ib0441e42cc133b092b79a63da1ac680e1898a877 --- .../impl/ExpeditionExtendedDataImporterImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/java/com.sap.sailing.server.trackfiles/src/com/sap/sailing/server/trackfiles/impl/ExpeditionExtendedDataImporterImpl.java b/java/com.sap.sailing.server.trackfiles/src/com/sap/sailing/server/trackfiles/impl/ExpeditionExtendedDataImporterImpl.java index a917ef5b58e..838d8331b22 100755 --- a/java/com.sap.sailing.server.trackfiles/src/com/sap/sailing/server/trackfiles/impl/ExpeditionExtendedDataImporterImpl.java +++ b/java/com.sap.sailing.server.trackfiles/src/com/sap/sailing/server/trackfiles/impl/ExpeditionExtendedDataImporterImpl.java @@ -256,12 +256,12 @@ public class ExpeditionExtendedDataImporterImpl extends AbstractDoubleVectorFixI final TimePoint timePoint; final String date; final String dateFormatPattern; - if (columnsInFileFromHeader.containsKey(GPS_TIME_COLUMN)) { + if (columnsInFileFromHeader.containsKey(GPS_TIME_COLUMN) && !lineContentTokens[columnsInFileFromHeader.get(GPS_TIME_COLUMN)].trim().isEmpty()) { timePoint = getTimePoint(lineContentTokens[columnsInFileFromHeader.get(GPS_TIME_COLUMN)]); - } else if (columnsInFileFromHeader.containsKey(UTC_COLUMN)) { + } else if (columnsInFileFromHeader.containsKey(UTC_COLUMN) && !lineContentTokens[columnsInFileFromHeader.get(UTC_COLUMN)].trim().isEmpty()) { timePoint = getTimePoint(lineContentTokens[columnsInFileFromHeader.get(UTC_COLUMN)]); - } else if (columnsInFileFromHeader.containsKey(DATE_COLUMN_1) - || columnsInFileFromHeader.containsKey(DATE_COLUMN_2)) { + } else if (columnsInFileFromHeader.containsKey(DATE_COLUMN_1) && !lineContentTokens[columnsInFileFromHeader.get(DATE_COLUMN_1)].trim().isEmpty() + || columnsInFileFromHeader.containsKey(DATE_COLUMN_2) && !lineContentTokens[columnsInFileFromHeader.get(DATE_COLUMN_2)].trim().isEmpty()) { if (columnsInFileFromHeader.containsKey(DATE_COLUMN_1)) { date = lineContentTokens[columnsInFileFromHeader.get(DATE_COLUMN_1)]; dateFormatPattern = DATE_COLUMN_1_PATTERN;