From 5b41f21c57274c4f2e58b78dcb8666d0b37dc6d2 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 27 Jun 2014 15:05:06 -0400
Subject: [PATCH] Merge branch 'ticket/115' into develop

---
 src/main/java/com/gitblit/GitBlitServer.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/gitblit/GitBlitServer.java b/src/main/java/com/gitblit/GitBlitServer.java
index 4191e9b..b40e21f 100644
--- a/src/main/java/com/gitblit/GitBlitServer.java
+++ b/src/main/java/com/gitblit/GitBlitServer.java
@@ -198,7 +198,9 @@
 				e.printStackTrace();
 			} finally {
 				try {
-					is.close();
+					if (is != null) {
+						is.close();
+					}
 				} catch (IOException e) {
 					e.printStackTrace();
 				}

--
Gitblit v1.9.1