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

Merge branch '6770-Domain-Discovery-Thumbnail-API' into 6847-Hook-Up-Domain-UI-And-Thumbnailing

Browse Source
This commit is contained in:
U-BASIS\dsmyda 2020-09-16 14:19:03 -04:00
commit 39f8730ab1
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/src/org/sleuthkit/autopsy/discovery/search/DomainSearchArtifactsCache.java
View File

@ -29,7 +29,7 @@ import org.sleuthkit.datamodel.BlackboardArtifact;
*/ */
public class DomainSearchArtifactsCache { public class DomainSearchArtifactsCache {
private static final int MAXIMUM_CACHE_SIZE = 5; private static final int MAXIMUM_CACHE_SIZE = 500;
private static final LoadingCache<DomainSearchArtifactsRequest, List<BlackboardArtifact>> cache private static final LoadingCache<DomainSearchArtifactsRequest, List<BlackboardArtifact>> cache
= CacheBuilder.newBuilder() = CacheBuilder.newBuilder()
.maximumSize(MAXIMUM_CACHE_SIZE) .maximumSize(MAXIMUM_CACHE_SIZE)
@ -49,7 +49,7 @@ public class DomainSearchArtifactsCache {
try { try {
return cache.get(request); return cache.get(request);
} catch (ExecutionException ex) { } catch (ExecutionException ex) {
throw new DiscoveryException("Error fetching artifacts from cache", ex.getCause()); throw new DiscoveryException("Error fetching artifacts from cache", ex);
} }
} }
} }

2
Core/src/org/sleuthkit/autopsy/discovery/search/DomainSearchArtifactsLoader.java
View File

@ -49,7 +49,7 @@ public class DomainSearchArtifactsLoader extends CacheLoader<DomainSearchArtifac
final BlackboardAttribute tskDomain = artifact.getAttribute(TSK_DOMAIN); final BlackboardAttribute tskDomain = artifact.getAttribute(TSK_DOMAIN);
final BlackboardAttribute tskUrl = artifact.getAttribute(TSK_URL); final BlackboardAttribute tskUrl = artifact.getAttribute(TSK_URL);
if (tskDomain != null && tskDomain.getValueString().toLowerCase().equals(normalizedDomain)) { if (tskDomain != null && tskDomain.getValueString().equalsIgnoreCase(normalizedDomain)) {
matchingDomainArtifacts.add(artifact); matchingDomainArtifacts.add(artifact);
} else if (tskUrl != null && tskUrl.getValueString().toLowerCase().contains(normalizedDomain)) { } else if (tskUrl != null && tskUrl.getValueString().toLowerCase().contains(normalizedDomain)) {
matchingDomainArtifacts.add(artifact); matchingDomainArtifacts.add(artifact);

2
Core/src/org/sleuthkit/autopsy/discovery/search/DomainSearchThumbnailCache.java
View File

@ -47,7 +47,7 @@ public class DomainSearchThumbnailCache {
try { try {
return cache.get(request); return cache.get(request);
} catch (ExecutionException ex) { } catch (ExecutionException ex) {
throw new DiscoveryException("Error fetching artifacts from cache", ex.getCause()); throw new DiscoveryException("Error fetching artifacts from cache", ex);
} }
} }
} }