diff --git a/bindings/java/src/org/sleuthkit/datamodel/AbstractFile.java b/bindings/java/src/org/sleuthkit/datamodel/AbstractFile.java index c05331ed9578b81de29c8d07f5b2a4b40a9eabb1..4ee740047dd58f3d4d335c7c81893512afba405b 100644 --- a/bindings/java/src/org/sleuthkit/datamodel/AbstractFile.java +++ b/bindings/java/src/org/sleuthkit/datamodel/AbstractFile.java @@ -892,10 +892,8 @@ protected final int readLocal(byte[] buf, long offset, long len) throws TskCoreE * read() will read the file in the local path. * * @param localPath local path to be set - * @param isAbsolute true if the path is absolute, false if relative to the - * case db */ - void setLocalFilePath(String localPath, boolean isAbsolute) { + void setLocalFilePath(String localPath) { if (localPath == null || localPath.equals("")) { this.localPath = ""; @@ -903,7 +901,8 @@ void setLocalFilePath(String localPath, boolean isAbsolute) { localPathSet = false; } else { this.localPath = localPath; - if (isAbsolute) { + if (localPath.startsWith("/") || localPath.startsWith("\\") + || localPath.matches("[A-Za-z]:[/\\\\].*")) { this.localAbsPath = localPath; } else { this.localAbsPath = getSleuthkitCase().getDbDirPath() + java.io.File.separator + this.localPath; @@ -1256,7 +1255,7 @@ public short getAttrId() { */ @Deprecated protected void setLocalPath(String localPath, boolean isAbsolute) { - setLocalFilePath(localPath, isAbsolute); + setLocalFilePath(localPath); } /* diff --git a/bindings/java/src/org/sleuthkit/datamodel/DerivedFile.java b/bindings/java/src/org/sleuthkit/datamodel/DerivedFile.java index ce60113e4c540c4f6fe987be7279c8bd8f1da200..629a624323569cb4e6d28e29a2561db075752417 100644 --- a/bindings/java/src/org/sleuthkit/datamodel/DerivedFile.java +++ b/bindings/java/src/org/sleuthkit/datamodel/DerivedFile.java @@ -103,7 +103,7 @@ public class DerivedFile extends AbstractFile { super(db, objId, dataSourceObjectId, TskData.TSK_FS_ATTR_TYPE_ENUM.TSK_FS_ATTR_TYPE_DEFAULT, 0, name, TSK_DB_FILES_TYPE_ENUM.LOCAL, 0L, 0, dirType, metaType, dirFlag, metaFlags, size, ctime, crtime, atime, mtime, (short) 0, 0, 0, md5Hash, knownState, parentPath, mimeType, extension); - setLocalFilePath(localPath, false); + setLocalFilePath(localPath); setEncodingType(encodingType); } diff --git a/bindings/java/src/org/sleuthkit/datamodel/LocalFile.java b/bindings/java/src/org/sleuthkit/datamodel/LocalFile.java index d5fd6eac39f2a888da8110d685caa2451e307eff..b174a5cd1c652dab00c36d41f6bbf100e9f802a8 100644 --- a/bindings/java/src/org/sleuthkit/datamodel/LocalFile.java +++ b/bindings/java/src/org/sleuthkit/datamodel/LocalFile.java @@ -98,7 +98,7 @@ public class LocalFile extends AbstractFile { if (parentId > 0) { setParentId(parentId); } - super.setLocalFilePath(localPath, true); + super.setLocalFilePath(localPath); setEncodingType(encodingType); }