codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-09-03 22:39:56 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3680 from millmanorama/error-handling-fixes

Browse Source 
minor error handling fixes
This commit is contained in:
Richard Cordovano
2018-04-16 09:21:12 -04:00
committed by GitHub
parent 2f8c0a0627 84f1f335c5
commit a3eb0d7dd0
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Core/src/org/sleuthkit/autopsy/timeline/datamodel/EventsRepository.java
View File

@@ -153,7 +153,7 @@ public class EventsRepository {
.expireAfterAccess(10, TimeUnit.MINUTES)
.build(new CacheLoader<Long, SingleEvent>() {
@Override
public SingleEvent load(Long eventID) throws Exception {
public SingleEvent load(Long eventID) throws TskCoreException {
return eventManager.getEventById(eventID);
}
});
@@ -162,7 +162,7 @@ public class EventsRepository {
.expireAfterAccess(10, TimeUnit.MINUTES)
.build(new CacheLoader<ZoomParams, Map<EventType, Long>>() {
@Override
public Map<EventType, Long> load(ZoomParams params) throws Exception {
public Map<EventType, Long> load(ZoomParams params) throws TskCoreException {
return eventManager.countEventsByType(params);
}
});
@@ -171,7 +171,7 @@ public class EventsRepository {
.expireAfterAccess(10, TimeUnit.MINUTES
).build(new CacheLoader<ZoomParams, List<EventStripe>>() {
@Override
public List<EventStripe> load(ZoomParams params) throws Exception {
public List<EventStripe> load(ZoomParams params) throws TskCoreException {
return eventManager.getEventStripes(params, TimeLineController.getJodaTimeZone());
}
});
@@ -534,7 +534,7 @@ public class EventsRepository {
"progressWindow.msg.refreshingResultTags=Refreshing result tags",
"progressWindow.msg.gatheringData=Gathering event data",
"progressWindow.msg.commitingDb=Committing events database"})
protected Void call() throws Exception {
protected Void call() throws TskCoreException {
SleuthkitCase.CaseDbTransaction trans = eventManager.beginTransaction();
if (dbPopulationMode == DBPopulationMode.FULL) {
//drop old db, and add back MAC and artifact events
@@ -555,7 +555,7 @@ public class EventsRepository {
if (dbPopulationMode == DBPopulationMode.TAGS_ONLY) {
trans = eventManager.beginTransaction();
logger.log(Level.INFO, "dropping old tags"); // NON-NLS
eventManager.reInitializeTags();
// eventManager.reInitializeTags();
}
logger.log(Level.INFO, "updating content tags"); // NON-NLS
@@ -696,7 +696,7 @@ public class EventsRepository {
} catch (CancellationException ex) {
logger.log(Level.WARNING, "Timeline database population was cancelled by the user. " //NON-NLS
+ " Not all events may be present or accurate."); // NON-NLS
} catch (Exception ex) {
} catch (InterruptedException | ExecutionException ex) {
logger.log(Level.WARNING, "Unexpected exception while populating database.", ex); // NON-NLS
JOptionPane.showMessageDialog(WindowManager.getDefault().getMainWindow(), Bundle.msgdlg_problem_text());
}

2
Core/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventNodeBase.java
View File

@@ -324,7 +324,7 @@ public abstract class EventNodeBase<Type extends TimeLineEvent> extends StackPan
}
@Override
protected void succeeded() {
protected void done() {
super.succeeded();
try {
tooltip.setText(get());