ODE-755 since location is now part of almost all log records, it is r…

…enamed to be more generic Also fixed a NPE
Trihydro · Apr 26, 2018 · e2655fd · e2655fd
1 parent 2f5c16c
commit e2655fd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/importer/ImporterProcessor.java b/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/importer/ImporterProcessor.java
@@ -80,7 +80,8 @@ public void processAndBackupFile(Path filePath, Path backupDir, Path failureDir)
 
  try {
  inputStream = new FileInputStream(filePath.toFile());
- if (Files.probeContentType(filePath).equals("application/gzip")) { 
+ String probeContentType = Files.probeContentType(filePath);
+ if (probeContentType != null && probeContentType.equals("application/gzip")) { 
  inputStream = new GZIPInputStream(inputStream);
  }
  bis = new BufferedInputStream(inputStream, odeProperties.getImportProcessorBufferSize());

diff --git a/...o/ode/importer/parser/TimLogLocation.java → .../jpo/ode/importer/parser/LogLocation.java b/...o/ode/importer/parser/TimLogLocation.java → .../jpo/ode/importer/parser/LogLocation.java
@@ -3,15 +3,15 @@
 /**
  * POJO class for TIM log file location data
  */
-public class TimLogLocation {
+public class LogLocation {
 
  private int latitude;
  private int longitude;
  private int elevation;
  private short speed;
  private short heading;
 
- public TimLogLocation() {
+ public LogLocation() {
  super();
  }