Merge remote-tracking branch 'upstream/develop' into collaborative

This commit is contained in:
Richard Cordovano 2015-05-28 11:15:18 -04:00
commit f34de7d596

View File

@ -153,10 +153,13 @@ public class FileTypeDetector {
ArrayList<BlackboardAttribute> attributes = file.getGenInfoAttributes(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_FILE_TYPE_SIG); ArrayList<BlackboardAttribute> attributes = file.getGenInfoAttributes(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_FILE_TYPE_SIG);
for (BlackboardAttribute attribute : attributes) { for (BlackboardAttribute attribute : attributes) {
/** /**
* There should be at most one TSK_FILE_TYPE_SIG attribute. * There should be at most one TSK_FILE_TYPE_SIG attribute...
*/ */
fileType = attribute.getValueString(); String postedFileType = attribute.getValueString();
break; if (null != postedFileType && !postedFileType.isEmpty()) {
fileType = postedFileType;
break;
}
} }
return fileType; return fileType;
} }