From f66e89662c091e082bd1d2feb6ac91513ccff273 Mon Sep 17 00:00:00 2001 From: Rafael Cavazin <rafaelcavazin@gmail.com> Date: Sun, 21 Jul 2013 09:59:00 -0400 Subject: [PATCH] Merge branch 'master' of https://github.com/gitblit/gitblit --- src/main/java/com/gitblit/authority/CertificatesTableModel.java | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/gitblit/authority/CertificatesTableModel.java b/src/main/java/com/gitblit/authority/CertificatesTableModel.java index 44d80e3..333836d 100644 --- a/src/main/java/com/gitblit/authority/CertificatesTableModel.java +++ b/src/main/java/com/gitblit/authority/CertificatesTableModel.java @@ -138,6 +138,9 @@ public void setUserCertificateModel(UserCertificateModel ucm) { this.ucm = ucm; + if (ucm == null) { + return; + } Collections.sort(ucm.certs, new Comparator<X509Certificate>() { @Override public int compare(X509Certificate o1, X509Certificate o2) { -- Gitblit v1.9.1