From 51740339142c4b00a59cea29babd6af69e7bf067 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 10 Jun 2014 11:51:43 -0400
Subject: [PATCH] Merge pull request #189 from yin8086/release-v1.6.0-Chinese
---
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