From f565cf8344704ceccaeb0406b176ba535d138e98 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <eroseman@basistech.com>
Date: Thu, 11 Jun 2020 11:36:52 -0400
Subject: [PATCH] 6428 PR comments

---
 .../centralrepository/datamodel/Persona.java    | 17 +++++++++++++----
 .../persona/PersonaManagerTopComponent.java     |  4 ++--
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/Persona.java b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/Persona.java
index 654dfc5562..5b0226dea9 100644
--- a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/Persona.java
+++ b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/Persona.java
@@ -255,7 +255,7 @@ public class Persona {
     }
     
     /**
-     * Sets the comment of this persona
+     * Sets the comment of this persona.
      *
      * @param name The new comment.
      * 
@@ -263,7 +263,10 @@ public class Persona {
      */
     public void setComment(String comment) throws CentralRepoException {
         String updateClause = "UPDATE personas SET comment = \"" + comment + "\" WHERE id = " + id;
-        CentralRepository.getInstance().executeUpdateSQL(updateClause);
+        CentralRepository cr = CentralRepository.getInstance();
+        if (cr != null) {
+            cr.executeUpdateSQL(updateClause);
+        }
     }
 
     /**
@@ -275,7 +278,10 @@ public class Persona {
      */
     public void setName(String name) throws CentralRepoException {
         String updateClause = "UPDATE personas SET name = \"" + name + "\" WHERE id = " + id;
-        CentralRepository.getInstance().executeUpdateSQL(updateClause);
+        CentralRepository cr = CentralRepository.getInstance();
+        if (cr != null) {
+            cr.executeUpdateSQL(updateClause);
+        }
     }
 
     /**
@@ -311,7 +317,10 @@ public class Persona {
      */
     public void delete() throws CentralRepoException {
         String deleteSQL = "UPDATE personas SET status_id = " + PersonaStatus.DELETED.status_id + " WHERE id = " + this.id;
-        CentralRepository.getInstance().executeUpdateSQL(deleteSQL);
+        CentralRepository cr = CentralRepository.getInstance();
+        if (cr != null) {
+            cr.executeDeleteSQL(deleteSQL);
+        }
     }
 
     /**
diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/persona/PersonaManagerTopComponent.java b/Core/src/org/sleuthkit/autopsy/centralrepository/persona/PersonaManagerTopComponent.java
index be40c8d33c..ab20967822 100644
--- a/Core/src/org/sleuthkit/autopsy/centralrepository/persona/PersonaManagerTopComponent.java
+++ b/Core/src/org/sleuthkit/autopsy/centralrepository/persona/PersonaManagerTopComponent.java
@@ -56,7 +56,7 @@ public final class PersonaManagerTopComponent extends TopComponent {
     @Messages({
         "PMTopComponent_Name=Persona Manager",
         "PMTopComponent_delete_exception_Title=Delete failure",
-        "PMTopComponent_delete_exception_msg=Failed to delete persona",
+        "PMTopComponent_delete_exception_msg=Failed to delete persona.",
     })
     public PersonaManagerTopComponent() {
         initComponents();
@@ -204,7 +204,7 @@ public final class PersonaManagerTopComponent extends TopComponent {
 
     @Messages({
         "PMTopComponent_search_exception_Title=Search failure",
-        "PMTopComponent_search_exception_msg=Failed to search personas",})
+        "PMTopComponent_search_exception_msg=Failed to search personas.",})
     private void executeSearch() {
         Collection<Persona> results;
         try {