Skip to content
Snippets Groups Projects
Commit 6945ccdb authored by Richard Cordovano's avatar Richard Cordovano
Browse files

Merge pull request #458 from karlmortensen/retry_db_operations

Retry database operations
parents 0c460824 34dc3ae7
No related branches found
No related tags found
No related merge requests found
......@@ -163,6 +163,7 @@ SleuthkitCase.addLocalFile.exception.msg1.text=Error adding local file\: {0}, pa
SleuthkitCase.addLocalFile.exception.msg2.text=Error creating a local file, cannot get new id of the object, file name\: {0}
SleuthkitCase.addLocalFile.exception.msg3.text=Error creating a derived file, file name\: {0}
SleuthkitCase.getLastObjectId.exception.msg.text=Error closing result set after getting last object id.
SleuthkitCase.CouldNotCompleteDatabaseOperation=Could not complete the database operation
TskData.tskFsNameFlagEnum.allocated=Allocated
TskData.tskFsNameFlagEnum.unallocated=Unallocated
TskData.tskFsMetaFlagEnum.allocated=Allocated
......
......@@ -41,17 +41,15 @@ public class CaseDbConnectionInfo {
private DbType dbType;
private static final Logger logger = Logger.getLogger(CaseDbConnectionInfo.class.getName());
// Assorted constructors
public CaseDbConnectionInfo() {
dbType = DbType.SQLITE;
}
public CaseDbConnectionInfo(String hostNameOrIP, String portNumber, String userName, String password, DbType dbType) {
this.hostNameOrIP = hostNameOrIP;
this.portNumber = portNumber;
this.userName = userName;
this.password = password;
this.dbType = dbType;
if (this.dbType == DbType.SQLITE) {
logger.log(Level.WARNING, "Bad remote database case type!");
}
}
public DbType getDbType() {
......
......@@ -159,10 +159,6 @@ protected int readInt(byte[] buf, long offset, long len) throws TskCoreException
Content dataSource = getDataSource();
if ((dataSource != null) && (dataSource instanceof Image)) {
Image image = (Image)dataSource;
if (!image.imageFileExists()) {
tskCase.submitError(bundle.getString("FsContent.readInt.err.context.text"),
bundle.getString("FsContent.readInt.err.msg.text"));
}
}
throw ex;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment