codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-08-30 16:11:57 +00:00
Code Issues Releases Wiki Activity

fix in data fetcher

Browse Source
This commit is contained in:
Greg DiCristofaro
2021-11-12 09:11:16 -05:00
parent b665a0aacc
commit 07094de355
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java
View File

@@ -1152,8 +1152,7 @@ public class DataResultPanel extends javax.swing.JPanel implements DataResult, C
*/
void displayDataArtifact(DataArtifactSearchParam dataArtifactParams) {
try {
DataArtifactDAO dataArtDAO = MainDAO.getInstance().getDataArtifactsDAO();
this.searchResultManager = new SearchManager(dataArtDAO.new DataArtifactFetcher(dataArtifactParams), getPageSize());
this.searchResultManager = new SearchManager(new DataArtifactFetcher(dataArtifactParams), getPageSize());
SearchResultsDTO results = searchResultManager.getResults();
displaySearchResults(results, true);
} catch (ExecutionException ex) {

10
Core/src/org/sleuthkit/autopsy/mainui/datamodel/DataArtifactDAO.java
View File

@@ -220,8 +220,9 @@ public class DataArtifactDAO extends BlackboardArtifactDAO {
/*
* Handles fetching and paging of data artifacts.
*/
public class DataArtifactFetcher extends DAOFetcher<DataArtifactSearchParam> {
public static class DataArtifactFetcher extends DAOFetcher<DataArtifactSearchParam> {
private final DataArtifactDAO dao;
/**
* Main constructor.
*
@@ -229,16 +230,17 @@ public class DataArtifactDAO extends BlackboardArtifactDAO {
*/
public DataArtifactFetcher(DataArtifactSearchParam params) {
super(params);
this.dao = MainDAO.getInstance().getDataArtifactsDAO();
}
@Override
public SearchResultsDTO getSearchResults(int pageSize, int pageIdx, boolean hardRefresh) throws ExecutionException {
return MainDAO.getInstance().getDataArtifactsDAO().getDataArtifactsForTable(this.getParameters(), pageIdx * pageSize, (long) pageSize, hardRefresh);
return dao.getDataArtifactsForTable(this.getParameters(), pageIdx * pageSize, (long) pageSize, hardRefresh);
}
@Override
public boolean isRefreshRequired(DAOEvent evt) {
return DataArtifactDAO.this.isDataArtifactInvalidating(this.getParameters(), evt);
return dao.isDataArtifactInvalidating(this.getParameters(), evt);
}
}
}