From 7fb8d1209a3926329638fc3ca5f0b4bc428029f6 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 13 Jun 2014 08:54:26 -0400
Subject: [PATCH] Catch flotr2 exceptions, otherwise downstream AngularJS doesn't execute
---
src/main/java/com/gitblit/auth/PAMAuthProvider.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/gitblit/auth/PAMAuthProvider.java b/src/main/java/com/gitblit/auth/PAMAuthProvider.java
index 7e82bc6..5d441b8 100644
--- a/src/main/java/com/gitblit/auth/PAMAuthProvider.java
+++ b/src/main/java/com/gitblit/auth/PAMAuthProvider.java
@@ -98,7 +98,9 @@
logger.error(e.getMessage());
return null;
} finally {
- pam.dispose();
+ if (pam != null) {
+ pam.dispose();
+ }
}
UserModel user = userManager.getUserModel(username);
--
Gitblit v1.9.1