From fb9813874c811ae06604c30d875e9dce57df9874 Mon Sep 17 00:00:00 2001
From: SHaselbauer <sarah.haselbauer@akquinet.de>
Date: Mon, 21 Jan 2013 16:28:11 -0500
Subject: [PATCH] Merge multiple owners feature (pull request #63, #66)

---
 src/com/gitblit/GitServlet.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/com/gitblit/GitServlet.java b/src/com/gitblit/GitServlet.java
index b55df04..ff1ea7e 100644
--- a/src/com/gitblit/GitServlet.java
+++ b/src/com/gitblit/GitServlet.java
@@ -318,8 +318,12 @@
 			}
 
 			// update push log
-			PushLogUtils.updatePushLog(user, rp.getRepository(), commands);
-			logger.info(MessageFormat.format("{0} push log updated", repository.name));
+			try {
+				PushLogUtils.updatePushLog(user, rp.getRepository(), commands);
+				logger.info(MessageFormat.format("{0} push log updated", repository.name));
+			} catch (Exception e) {
+				logger.error(MessageFormat.format("Failed to update {0} pushlog", repository.name), e);
+			}
 			
 			// run Groovy hook scripts 
 			Set<String> scripts = new LinkedHashSet<String>();

--
Gitblit v1.9.1