Skip to content
Snippets Groups Projects
Unverified Commit ce487d1d authored by Ann Priestman's avatar Ann Priestman Committed by GitHub
Browse files

Merge pull request #1970 from APriestman/formattingfixes

Formatting fixes
parents a7472204 0bdf7299
No related branches found
No related tags found
No related merge requests found
...@@ -375,12 +375,12 @@ private long addBatchedFilesToDb() { ...@@ -375,12 +375,12 @@ private long addBatchedFilesToDb() {
} }
} }
commitTransaction(); commitTransaction();
try { try {
addDataSourceCallbacks.onFilesAdded(newObjIds); addDataSourceCallbacks.onFilesAdded(newObjIds);
} catch (Exception ex) { } catch (Exception ex) {
// Exception firewall to prevent unexpected return to the native code // Exception firewall to prevent unexpected return to the native code
logger.log(Level.SEVERE, "Unexpected error from files added callback", ex); logger.log(Level.SEVERE, "Unexpected error from files added callback", ex);
} }
} catch (TskCoreException ex) { } catch (TskCoreException ex) {
logger.log(Level.SEVERE, "Error adding batched files to database", ex); logger.log(Level.SEVERE, "Error adding batched files to database", ex);
revertTransaction(); revertTransaction();
...@@ -414,7 +414,7 @@ private long getParentObjId(FileInfo fileInfo) throws TskCoreException { ...@@ -414,7 +414,7 @@ private long getParentObjId(FileInfo fileInfo) throws TskCoreException {
// stored in the cache. // stored in the cache.
throw new TskCoreException("Parent not found in cache (fsObjId: " +fileInfo.fsObjId + ", parMetaAddr: " + fileInfo.parMetaAddr throw new TskCoreException("Parent not found in cache (fsObjId: " +fileInfo.fsObjId + ", parMetaAddr: " + fileInfo.parMetaAddr
+ ", parSeq: " + fileInfo.parSeq + ", parentPath: " + parentPath + ")"); + ", parSeq: " + fileInfo.parSeq + ", parentPath: " + parentPath + ")");
} }
} }
/** /**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment