From e627cfcaa9c567849cf11759260803ae380a034e Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 27 Nov 2012 16:58:14 -0500
Subject: [PATCH] Make activity page respect short commit id setting and lower default from 8 to 6
---
src/com/gitblit/authority/UserCertificateConfig.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/com/gitblit/authority/UserCertificateConfig.java b/src/com/gitblit/authority/UserCertificateConfig.java
index 47132a0..5ec76f7 100644
--- a/src/com/gitblit/authority/UserCertificateConfig.java
+++ b/src/com/gitblit/authority/UserCertificateConfig.java
@@ -51,6 +51,7 @@
uc.expires = df.parse(c.getString("user", username, "expires"));
} catch (ParseException e) {
LoggerFactory.getLogger(UserCertificateConfig.class).error("Failed to parse date!", e);
+ } catch (NullPointerException e) {
}
uc.notes = c.getString("user", username, "notes");
uc.revoked = new ArrayList<String>(Arrays.asList(c.getStringList("user", username, "revoked")));
--
Gitblit v1.9.1