Merge pull request #1300 from APriestman/timezoneNPE

Switched call to getStringTime to use dataSource instead of abstractF…
This commit is contained in:
Richard Cordovano 2015-06-02 14:43:20 -04:00
commit 0c74f22735

View File

@ -96,7 +96,8 @@ public class SolrSearchService implements KeywordSearchService {
|| attribute.getAttributeTypeID() == BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DATETIME_SENT.getTypeID()
|| attribute.getAttributeTypeID() == BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DATETIME_START.getTypeID()
|| attribute.getAttributeTypeID() == BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DATETIME_END.getTypeID()) {
artifactContents.append(ContentUtils.getStringTime(attribute.getValueLong(), abstractFile));
artifactContents.append(ContentUtils.getStringTime(attribute.getValueLong(), dataSource));
}
else
artifactContents.append(attribute.getDisplayString());