From d62d883423c4f13e9514c203d2f0b14e4715df7f Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 23 May 2014 09:19:01 -0400
Subject: [PATCH] Tag server-side merges when incremental push tags are enabled
---
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