From 89e54f3254c396fc924fe7ad81fd48ce25aecd6d Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 13 Jul 2013 11:05:02 -0400
Subject: [PATCH] Fixed possible NPE in forks page if user account no longer exists
---
src/main/java/com/gitblit/authority/UserOidsPanel.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/gitblit/authority/UserOidsPanel.java b/src/main/java/com/gitblit/authority/UserOidsPanel.java
index 8c3adf6..5a33b3f 100644
--- a/src/main/java/com/gitblit/authority/UserOidsPanel.java
+++ b/src/main/java/com/gitblit/authority/UserOidsPanel.java
@@ -61,14 +61,14 @@
public void setUserCertificateModel(UserCertificateModel ucm) {
setEditable(false);
- displayname.setText(ucm.user.getDisplayName());
- username.setText(ucm.user.username);
- emailAddress.setText(ucm.user.emailAddress);
- organizationalUnit.setText(ucm.user.organizationalUnit);
- organization.setText(ucm.user.organization);
- locality.setText(ucm.user.locality);
- stateProvince.setText(ucm.user.stateProvince);
- countryCode.setText(ucm.user.countryCode);
+ displayname.setText(ucm == null ? "" : ucm.user.getDisplayName());
+ username.setText(ucm == null ? "" : ucm.user.username);
+ emailAddress.setText(ucm == null ? "" : ucm.user.emailAddress);
+ organizationalUnit.setText(ucm == null ? "" : ucm.user.organizationalUnit);
+ organization.setText(ucm == null ? "" : ucm.user.organization);
+ locality.setText(ucm == null ? "" : ucm.user.locality);
+ stateProvince.setText(ucm == null ? "" : ucm.user.stateProvince);
+ countryCode.setText(ucm == null ? "" : ucm.user.countryCode);
}
public void setEditable(boolean editable) {
--
Gitblit v1.9.1