fix: NPE in AssuranceDisplay when name was deleted.

Change-Id: I658cb78bb2c3047054393d89854503eb680d7565

diff --git a/src/org/cacert/gigi/output/AssurancesDisplay.java b/src/org/cacert/gigi/output/AssurancesDisplay.java
index 595872ac3ac778f98c8760beac6887a14b5c62b7..8f0e6cabb54085287700e059db012ec1729aec35 100644 (file)
--- a/src/org/cacert/gigi/output/AssurancesDisplay.java
+++ b/src/org/cacert/gigi/output/AssurancesDisplay.java
@@ -4,6 +4,7 @@ import java.io.PrintWriter;
 import java.util.Map;
 
 import org.cacert.gigi.dbObjects.Assurance;
+import org.cacert.gigi.dbObjects.Name;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.template.IterableDataset;
 import org.cacert.gigi.output.template.Outputable;
@@ -44,12 +45,13 @@ public class AssurancesDisplay implements Outputable {
                     Assurance assurance = assurances[i];
                     vars.put("id", assurance.getId());
                     vars.put("method", assurance.getMethod());
+                    Name to = assurance.getTo();
                     if (assurer) {
-                        vars.put("verbVal", assurance.getTo().getOwner().getId());
-                        vars.put("myName", assurance.getTo());
+                        vars.put("verbVal", to == null ? l.getTranslation("applicant's name removed") : to.getOwner().getId());
+                        vars.put("myName", to == null ? l.getTranslation("applicant's name removed") : to);
                     } else {
                         vars.put("verbVal", assurance.getFrom().getPreferredName());
-                        vars.put("myName", assurance.getTo());
+                        vars.put("myName", to == null ? l.getTranslation("own name removed") : to);
                     }
                     vars.put("date", assurance.getDate());
                     vars.put("location", assurance.getLocation());