From a69b25b08b60f819b83b753a9fb8a037d65b6ef1 Mon Sep 17 00:00:00 2001 From: adam-m Date: Wed, 13 Jun 2012 17:04:25 -0400 Subject: [PATCH] simplify fire service event, add more logging --- .../sleuthkit/autopsy/ingest/IngestManager.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestManager.java b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestManager.java index 90f2a5ce90..3a86f4d54a 100755 --- a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestManager.java +++ b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestManager.java @@ -960,15 +960,9 @@ public class IngestManager { stats.start(); //notify main thread services started - SwingUtilities.invokeLater(new Runnable() { - - @Override - public void run() { - for (IngestServiceAbstractFile s : AbstractFileServices) { - IngestManager.fireServiceEvent(SERVICE_STARTED_EVT, s.getName()); - } - } - }); + for (IngestServiceAbstractFile s : AbstractFileServices) { + IngestManager.fireServiceEvent(SERVICE_STARTED_EVT, s.getName()); + } final String displayName = "File Ingest"; progress = ProgressHandleFactory.createHandle(displayName, new Cancellable() { @@ -1041,7 +1035,10 @@ public class IngestManager { @Override protected void done() { try { + Date d1 = new Date(); super.get(); //block and get all exceptions thrown while doInBackground() + Date d2 = new Date(); + logger.log(Level.INFO, "File ingest get() took: " + (d2.getTime()-d1.getTime()) ); //notify services of completion if (!this.isCancelled()) { for (IngestServiceAbstractFile s : AbstractFileServices) {