From d42603f830ca2727ae7979e07abd695fa19ced07 Mon Sep 17 00:00:00 2001
From: Mark McKinnon <mark.mckinnon@davenport.edu>
Date: Wed, 20 Jan 2021 11:39:17 -0500
Subject: [PATCH] Update LeappFileProcessor.java

Fix merge conflict
---
 .../autopsy/modules/leappanalyzers/LeappFileProcessor.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Core/src/org/sleuthkit/autopsy/modules/leappanalyzers/LeappFileProcessor.java b/Core/src/org/sleuthkit/autopsy/modules/leappanalyzers/LeappFileProcessor.java
index 1776e1c3e9..00f4c58c40 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/leappanalyzers/LeappFileProcessor.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/leappanalyzers/LeappFileProcessor.java
@@ -407,7 +407,8 @@ public final class LeappFileProcessor {
             }
         } else if (attrType.matches("LONG")) {
             try {
-                bbattributes.add(new BlackboardAttribute(attributeType, MODULE_NAME, (long)Double.parseDouble(columnValue)));
+                // parse as double to handle values of format like '21.0' and then convert to long
+                bbattributes.add(new BlackboardAttribute(attributeType, MODULE_NAME, Double.valueOf(columnValue).longValue()));
             } catch (NumberFormatException ex) {
                 logger.log(Level.WARNING, String.format("Unable to format %s as an long.", columnValue), ex);
             }