From 58cd9c772924b094ab9dc6bbd40906c1d9e8ba7e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Mon, 1 Aug 2016 11:21:46 +0200 Subject: [PATCH 1/1] fix: NPE in AssuranceDisplay when name was deleted. Change-Id: I658cb78bb2c3047054393d89854503eb680d7565 --- src/org/cacert/gigi/output/AssurancesDisplay.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/org/cacert/gigi/output/AssurancesDisplay.java b/src/org/cacert/gigi/output/AssurancesDisplay.java index 595872ac..8f0e6cab 100644 --- 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()); -- 2.39.2