From ba6a035540bcc1df697b72a9840002856d61278c Mon Sep 17 00:00:00 2001
From: Kelly Kelly <kelly@basistech.com>
Date: Mon, 28 Jun 2021 14:57:30 -0400
Subject: [PATCH 1/3] Fixed NPE issue

---
 .../communications/VisualizationPanel.java    | 33 +++++--------------
 1 file changed, 8 insertions(+), 25 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/communications/VisualizationPanel.java b/Core/src/org/sleuthkit/autopsy/communications/VisualizationPanel.java
index 0fb2beac00..00e90f402a 100644
--- a/Core/src/org/sleuthkit/autopsy/communications/VisualizationPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/communications/VisualizationPanel.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2017-2018 Basis Technology Corp.
+ * Copyright 2017-2021 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -70,7 +70,6 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.function.BiConsumer;
 import java.util.logging.Level;
@@ -584,29 +583,13 @@ final public class VisualizationPanel extends JPanel {
         ModalDialogProgressIndicator progressIndicator = new ModalDialogProgressIndicator(windowAncestor, Bundle.VisualizationPanel_computingLayout());
         progressIndicator.start(Bundle.VisualizationPanel_computingLayout());
 
-        new SwingWorker<Void, Void>() {
-            @Override
-            protected Void doInBackground() {
-                graph.getModel().beginUpdate();
-                try {
-                    layout.execute(graph.getDefaultParent());
-                    fitGraph();
-                } finally {
-                    graph.getModel().endUpdate();
-                    progressIndicator.finish();
-                }
-                return null;
-            }
-
-            @Override
-            protected void done() {
-                try {
-                    get();
-                } catch (InterruptedException | ExecutionException ex) {
-                    logger.log(Level.WARNING, "CVT graph layout failed.", ex);
-                }
-            }
-        }.execute();
+        try {
+            layout.execute(graph.getDefaultParent());
+            fitGraph();
+        } finally {
+            graph.getModel().endUpdate();
+            progressIndicator.finish();
+        }
     }
 
     private void clearVizButtonActionPerformed(ActionEvent evt) {//GEN-FIRST:event_clearVizButtonActionPerformed

From 2e918f5aba563b8ac338f71db47b2df3f47669e1 Mon Sep 17 00:00:00 2001
From: Kelly Kelly <kelly@basistech.com>
Date: Tue, 29 Jun 2021 10:18:11 -0400
Subject: [PATCH 2/3] Added back removed beginUpdate

---
 .../org/sleuthkit/autopsy/communications/VisualizationPanel.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Core/src/org/sleuthkit/autopsy/communications/VisualizationPanel.java b/Core/src/org/sleuthkit/autopsy/communications/VisualizationPanel.java
index 00e90f402a..5804163838 100644
--- a/Core/src/org/sleuthkit/autopsy/communications/VisualizationPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/communications/VisualizationPanel.java
@@ -584,6 +584,7 @@ final public class VisualizationPanel extends JPanel {
         progressIndicator.start(Bundle.VisualizationPanel_computingLayout());
 
         try {
+            graph.getModel().beginUpdate();
             layout.execute(graph.getDefaultParent());
             fitGraph();
         } finally {

From 0a48ff1e469e4303f2f3f50b4d00785e7d6f04d3 Mon Sep 17 00:00:00 2001
From: Kelly Kelly <kelly@basistech.com>
Date: Tue, 29 Jun 2021 10:19:04 -0400
Subject: [PATCH 3/3] Added back removed beginUpdate

---
 .../sleuthkit/autopsy/communications/VisualizationPanel.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/communications/VisualizationPanel.java b/Core/src/org/sleuthkit/autopsy/communications/VisualizationPanel.java
index 5804163838..9e13769730 100644
--- a/Core/src/org/sleuthkit/autopsy/communications/VisualizationPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/communications/VisualizationPanel.java
@@ -582,9 +582,8 @@ final public class VisualizationPanel extends JPanel {
 
         ModalDialogProgressIndicator progressIndicator = new ModalDialogProgressIndicator(windowAncestor, Bundle.VisualizationPanel_computingLayout());
         progressIndicator.start(Bundle.VisualizationPanel_computingLayout());
-
-        try {
-            graph.getModel().beginUpdate();
+        graph.getModel().beginUpdate();
+        try {    
             layout.execute(graph.getDefaultParent());
             fitGraph();
         } finally {