From f44d7bca3f5490771cf16897c2d7f3d418ed899c Mon Sep 17 00:00:00 2001 From: Brian Carrier <carrier@sleuthkit.org> Date: Fri, 1 Feb 2013 17:18:43 -0500 Subject: [PATCH] Changed NULL MD5 behavior to not check string after other changes to db_sqlite.cpp --- .../src/org/sleuthkit/datamodel/FsContent.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/bindings/java/src/org/sleuthkit/datamodel/FsContent.java b/bindings/java/src/org/sleuthkit/datamodel/FsContent.java index f8f53955f..ee40d60f5 100644 --- a/bindings/java/src/org/sleuthkit/datamodel/FsContent.java +++ b/bindings/java/src/org/sleuthkit/datamodel/FsContent.java @@ -24,12 +24,12 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.sleuthkit.datamodel.TskData.FileKnown; +import org.sleuthkit.datamodel.TskData.TSK_FS_ATTR_TYPE_ENUM; import org.sleuthkit.datamodel.TskData.TSK_FS_META_FLAG_ENUM; +import org.sleuthkit.datamodel.TskData.TSK_FS_META_MODE_ENUM; import org.sleuthkit.datamodel.TskData.TSK_FS_META_TYPE_ENUM; import org.sleuthkit.datamodel.TskData.TSK_FS_NAME_FLAG_ENUM; import org.sleuthkit.datamodel.TskData.TSK_FS_NAME_TYPE_ENUM; -import org.sleuthkit.datamodel.TskData.TSK_FS_ATTR_TYPE_ENUM; -import org.sleuthkit.datamodel.TskData.TSK_FS_META_MODE_ENUM; /** * Generalized class that stores metadata that are common to both File and @@ -102,7 +102,7 @@ public abstract class FsContent extends AbstractFile { * @param mode * @param known * @param parent_path - * @param md5Hash + * @param md5Hash String of MD5 hash of content or null if not known */ FsContent(SleuthkitCase db, long obj_id, String name, long fs_obj_id, long meta_addr, TSK_FS_ATTR_TYPE_ENUM attrType, short attr_id, TSK_FS_META_TYPE_ENUM metaType, TSK_FS_NAME_TYPE_ENUM dirType, TSK_FS_NAME_FLAG_ENUM dirFlag, @@ -127,13 +127,7 @@ public abstract class FsContent extends AbstractFile { this.modes = TSK_FS_META_MODE_ENUM.valuesOf(modes); this.known = known; this.parentPath = parent_path; - if (md5Hash.equals("NULL")) { - this.md5Hash = null; - } - else { - this.md5Hash = md5Hash; - } - + this.md5Hash = md5Hash; } /** -- GitLab