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

1060: ingest stuck

Browse Source
This commit is contained in:
Raman 2018-10-09 09:55:51 -04:00
parent 8ff4b44b97
commit cc62e0c713
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryController.java
View File

@ -687,10 +687,18 @@ public final class ImageGalleryController {
progressHandle.start(); progressHandle.start();
caseDbTransaction.commit(); caseDbTransaction.commit();
caseDbTransaction = null;
// pass true so that groupmanager is notified of the changes // pass true so that groupmanager is notified of the changes
taskDB.commitTransaction(drawableDbTransaction, true); taskDB.commitTransaction(drawableDbTransaction, true);
drawableDbTransaction = null;
} catch (TskCoreException ex) { } catch (TskCoreException ex) {
progressHandle.progress(Bundle.BulkTask_stopCopy_status());
logger.log(Level.WARNING, "Stopping copy to drawable db task. Failed to transfer all database contents", ex); //NON-NLS
MessageNotifyUtil.Notify.warn(Bundle.BulkTask_errPopulating_errMsg(), ex.getMessage());
cleanup(false);
return;
} finally {
if (null != drawableDbTransaction) { if (null != drawableDbTransaction) {
taskDB.rollbackTransaction(drawableDbTransaction); taskDB.rollbackTransaction(drawableDbTransaction);
} }
@ -701,13 +709,6 @@ public final class ImageGalleryController {
logger.log(Level.SEVERE, "Error in trying to rollback transaction", ex2); //NON-NLS logger.log(Level.SEVERE, "Error in trying to rollback transaction", ex2); //NON-NLS
} }
} }
progressHandle.progress(Bundle.BulkTask_stopCopy_status());
logger.log(Level.WARNING, "Stopping copy to drawable db task. Failed to transfer all database contents", ex); //NON-NLS
MessageNotifyUtil.Notify.warn(Bundle.BulkTask_errPopulating_errMsg(), ex.getMessage());
cleanup(false);
return;
} finally {
progressHandle.finish(); progressHandle.finish();
if (taskCompletionStatus) { if (taskCompletionStatus) {
taskDB.insertOrUpdateDataSource(dataSourceObjId, DrawableDB.DrawableDbBuildStatusEnum.COMPLETE); taskDB.insertOrUpdateDataSource(dataSourceObjId, DrawableDB.DrawableDbBuildStatusEnum.COMPLETE);

11
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableDB.java
View File

@ -271,7 +271,9 @@ public final class DrawableDB {
insertGroup(cat.getDisplayName(), DrawableAttribute.CATEGORY, caseDbTransaction); insertGroup(cat.getDisplayName(), DrawableAttribute.CATEGORY, caseDbTransaction);
} }
caseDbTransaction.commit(); caseDbTransaction.commit();
} catch (TskCoreException ex) { caseDbTransaction = null;
}
finally {
if (null != caseDbTransaction) { if (null != caseDbTransaction) {
try { try {
caseDbTransaction.rollback(); caseDbTransaction.rollback();
@ -279,7 +281,6 @@ public final class DrawableDB {
logger.log(Level.SEVERE, "Error in trying to rollback transaction", ex2); logger.log(Level.SEVERE, "Error in trying to rollback transaction", ex2);
} }
} }
throw ex;
} }
initializeImageList(); initializeImageList();
@ -802,9 +803,14 @@ public final class DrawableDB {
caseDbTransaction = tskCase.beginTransaction(); caseDbTransaction = tskCase.beginTransaction();
updateFile(f, trans, caseDbTransaction); updateFile(f, trans, caseDbTransaction);
caseDbTransaction.commit(); caseDbTransaction.commit();
caseDbTransaction = null;
commitTransaction(trans, true); commitTransaction(trans, true);
trans = null;
} catch (TskCoreException ex) { } catch (TskCoreException ex) {
logger.log(Level.SEVERE, "Error updating file", ex); //NON-NLS
}
finally {
if (null != caseDbTransaction) { if (null != caseDbTransaction) {
try { try {
caseDbTransaction.rollback(); caseDbTransaction.rollback();
@ -815,7 +821,6 @@ public final class DrawableDB {
if (null != trans) { if (null != trans) {
rollbackTransaction(trans); rollbackTransaction(trans);
} }
logger.log(Level.SEVERE, "Error updating file", ex); //NON-NLS
} }
} }