mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-15 09:17:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2377 from wishdasher/develop

Browse Source 
ReportHTML NPE catch and log with detailed error message
This commit is contained in:
Richard Cordovano 2016-10-19 12:44:41 -04:00 committed by GitHub
commit 3e371d3c68
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Core/src/org/sleuthkit/autopsy/report/ReportHTML.java
View File

@ -1126,13 +1126,17 @@ class ReportHTML implements TableReportModule {
if (thumbFile.exists() == false) { if (thumbFile.exists() == false) {
return null; return null;
} }
File to = new File(thumbsPath);
FileObject from = FileUtil.toFileObject(thumbFile);
FileObject dest = FileUtil.toFileObject(to);
try { try {
File to = new File(thumbsPath);
FileObject from = FileUtil.toFileObject(thumbFile);
FileObject dest = FileUtil.toFileObject(to);
FileUtil.copyFile(from, dest, thumbFile.getName(), ""); FileUtil.copyFile(from, dest, thumbFile.getName(), "");
} catch (IOException ex) { } catch (IOException ex) {
logger.log(Level.SEVERE, "Failed to write thumb file to report directory.", ex); //NON-NLS logger.log(Level.SEVERE, "Failed to write thumb file to report directory.", ex); //NON-NLS
} catch (NullPointerException ex) {
logger.log(Level.SEVERE, "NPE generated from FileUtil.copyFile, probably because FileUtil.toFileObject returned null. \n" +
"The File argument for toFileObject was " + thumbFile + " with toString: " + thumbFile.toString() + "\n" +
"The FileObject returned by toFileObject, passed into FileUtil.copyFile, was " + from, ex);
} }
return THUMBS_REL_PATH + thumbFile.getName(); return THUMBS_REL_PATH + thumbFile.getName();