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

4650 modify implementation of getting datasource when already exists in newDataSource for sake of readability

Browse Source
This commit is contained in:
William Schaefer 2019-01-31 13:42:16 -05:00
parent 4f0f18c0b6
commit eb9aa212ed
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/AbstractSqlEamDb.java
View File

@ -639,8 +639,15 @@ abstract class AbstractSqlEamDb implements EamDb {
preparedStatement.executeUpdate(); preparedStatement.executeUpdate();
resultSet = preparedStatement.getGeneratedKeys(); resultSet = preparedStatement.getGeneratedKeys();
if (!resultSet.next()) { if (!resultSet.next()) {
//if nothing was inserted then throw an exception which will be caught and the existing datasource in the CR found //if nothing was inserted then return the DataSource that exists in the central repository
throw new EamDbException("No DataSource added to central repository, should already exist in CR"); //expected to occur in regards to PostgreSQL central repository databases
try {
return dataSourceCacheByDsObjectId.get(getDataSourceByDSObjectIdCacheKey(
eamDataSource.getCaseID(), eamDataSource.getDataSourceObjectID()),
() -> getDataSourceFromCr(eamDataSource.getCaseID(), eamDataSource.getDataSourceObjectID()));
} catch (CacheLoader.InvalidCacheLoadException | ExecutionException getException) {
throw new EamDbException(String.format("Unable to to INSERT or get data source %s in central repo:", eamDataSource.getName()), getException);
}
} else { } else {
//if a new data source was added to the central repository update the caches to include it and return it //if a new data source was added to the central repository update the caches to include it and return it
int dataSourceId = resultSet.getInt(1); //last_insert_rowid() int dataSourceId = resultSet.getInt(1); //last_insert_rowid()
@ -650,8 +657,9 @@ abstract class AbstractSqlEamDb implements EamDb {
return dataSource; return dataSource;
} }
} catch (EamDbException | SQLException insertException) { } catch (SQLException insertException) {
//if an exception was thrown causing us to not return the Datasource attempt to get the datasource to return //if an exception was thrown causing us to not return the Datasource attempt to get the datasource to return
//is expected to occur in regards to SQLite central repository databases
try { try {
return dataSourceCacheByDsObjectId.get(getDataSourceByDSObjectIdCacheKey( return dataSourceCacheByDsObjectId.get(getDataSourceByDSObjectIdCacheKey(
eamDataSource.getCaseID(), eamDataSource.getDataSourceObjectID()), eamDataSource.getCaseID(), eamDataSource.getDataSourceObjectID()),