From 94146dd495aad8157c423bfd9a1ae47c8e26b32c Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 03 Jul 2014 16:59:08 -0400 Subject: [PATCH] Use forked guice-servlet jar rather than stock jar from Google --- 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