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

Code improvements and optimizations

Browse Source
This commit is contained in:
Eugene Livis 2018-09-07 15:42:16 -04:00
parent dd3515176a
commit f5c89ff896
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashLookupSettings.java
View File

@ -296,17 +296,13 @@ final class HashLookupSettings implements Serializable {
database paths are in Windows user directory. If so, replace the path database paths are in Windows user directory. If so, replace the path
with USER_DIR_PLACEHOLDER so that it always gets updated to be the with USER_DIR_PLACEHOLDER so that it always gets updated to be the
current user directory path. Therefore we have to modify HashLookupSettings current user directory path. Therefore we have to modify HashLookupSettings
contents that are stored to disk. To make sure that some thread doesn't object contents that are stored to disk.
access the path at the wrong time (i.e. while it is replaced USER_DIR_PLACEHOLDER),
we need to make a copy of the HashLookupSettings, edit the copy, and save
the copy to disk. This way the HashLookupSettings objects that the rest
of the code is using is never modified and always contains actual full path
to the hash database.
*/ */
HashLookupSettings editedCopyOfSettings = copyAndEditHashLookupSettings(settings); editHashDbPaths(settings);
try (NbObjectOutputStream out = new NbObjectOutputStream(new FileOutputStream(SERIALIZATION_FILE_PATH))) { try (NbObjectOutputStream out = new NbObjectOutputStream(new FileOutputStream(SERIALIZATION_FILE_PATH))) {
// save the edited copy, not the original settings out.writeObject(settings);
out.writeObject(editedCopyOfSettings); // restore the paths, in case they are going to be used somewhere
editHashDbPaths(settings);
return true; return true;
} catch (Exception ex) { } catch (Exception ex) {
logger.log(Level.SEVERE, "Could not write hash set settings."); logger.log(Level.SEVERE, "Could not write hash set settings.");