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

Merge pull request #6898 from gdicristofaro/7516-categorizerNPE

Browse Source 
7516 categorizer NPE
This commit is contained in:
Richard Cordovano 2021-04-12 09:41:33 -04:00 committed by GitHub
commit a37b7f17cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
RecentActivity/src/org/sleuthkit/autopsy/recentactivity/DefaultDomainCategorizer.java
View File

@ -128,18 +128,33 @@ public class DefaultDomainCategorizer implements DomainCategorizer {
private Map<String, String> mapping = null;
@Override
public void initialize() throws DomainCategorizerException {
if (this.mapping == null) {
public synchronized void initialize() throws DomainCategorizerException {
if (isInitialized()) {
return;
}
try {
this.mapping = loadMapping();
} catch (IOException ex) {
throw new DomainCategorizerException("Unable to load domain type csv for domain category analysis", ex);
}
}
/**
* Returns true if this categorizer is properly initialized.
*
* @return True if this categorizer is properly initialized.
*/
private synchronized boolean isInitialized() {
return this.mapping != null;
}
@Override
public DomainCategory getCategory(String domain, String host) throws DomainCategorizerException {
public synchronized DomainCategory getCategory(String domain, String host) throws DomainCategorizerException {
if (!isInitialized()) {
initialize();
}
// use host; use domain as fallback if no host provided
String hostToUse = StringUtils.isBlank(host) ? domain : host;
@ -162,7 +177,7 @@ public class DefaultDomainCategorizer implements DomainCategorizer {
}
@Override
public void close() throws Exception {
public synchronized void close() throws Exception {
// clear out the mapping to release resources
mapping = null;
}