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

remove null checks

Browse Source
This commit is contained in:
millmanorama 2017-09-23 21:51:23 +02:00
parent 1a0ec35ef2
commit 61cdebf9ef
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AccountsText.java
View File

@ -228,14 +228,10 @@ class AccountsText implements IndexedText {
//add both the canonical form and the form in the text as accountNumbers to highlight. //add both the canonical form and the form in the text as accountNumbers to highlight.
BlackboardAttribute attribute = artifact.getAttribute(TSK_KEYWORD); BlackboardAttribute attribute = artifact.getAttribute(TSK_KEYWORD);
if (attribute != null) { this.accountNumbers.add(attribute.getValueString());
this.accountNumbers.add(attribute.getValueString());
}
attribute = artifact.getAttribute(TSK_CARD_NUMBER); attribute = artifact.getAttribute(TSK_CARD_NUMBER);
if (attribute != null) { this.accountNumbers.add(attribute.getValueString());
this.accountNumbers.add(attribute.getValueString());
}
//if the chunk id is present just use that. //if the chunk id is present just use that.
Optional<Integer> chunkID = Optional<Integer> chunkID =
Optional.ofNullable(artifact.getAttribute(TSK_KEYWORD_SEARCH_DOCUMENT_ID)) Optional.ofNullable(artifact.getAttribute(TSK_KEYWORD_SEARCH_DOCUMENT_ID))
@ -323,7 +319,7 @@ class AccountsText implements IndexedText {
// extracted content (minus highlight tags) is HTML-escaped // extracted content (minus highlight tags) is HTML-escaped
return "<html><pre>" + highlightedText + "</pre></html>"; //NON-NLS return "<html><pre>" + highlightedText + "</pre></html>"; //NON-NLS
} catch (Exception ex) { } catch (Exception ex) {
logger.log(Level.SEVERE, "Error getting highlighted text for Solr doc id " + this.solrObjectId + ", chunkID " + this.currentPage , ex); //NON-NLS logger.log(Level.SEVERE, "Error getting highlighted text for Solr doc id " + this.solrObjectId + ", chunkID " + this.currentPage, ex); //NON-NLS
return Bundle.AccountsText_getMarkup_queryFailedMsg(); return Bundle.AccountsText_getMarkup_queryFailedMsg();
} }
} }