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/manager/ServicesManager.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gitblit/manager/ServicesManager.java b/src/main/java/com/gitblit/manager/ServicesManager.java
index 755d8ba..3721578 100644
--- a/src/main/java/com/gitblit/manager/ServicesManager.java
+++ b/src/main/java/com/gitblit/manager/ServicesManager.java
@@ -112,9 +112,21 @@
}
public boolean isServingRepositories() {
- return settings.getBoolean(Keys.git.enableGitServlet, true)
- || (gitDaemon != null && gitDaemon.isRunning())
- || (sshDaemon != null && sshDaemon.isRunning());
+ return isServingHTTP()
+ || isServingGIT()
+ || isServingSSH();
+ }
+
+ public boolean isServingHTTP() {
+ return settings.getBoolean(Keys.git.enableGitServlet, true);
+ }
+
+ public boolean isServingGIT() {
+ return gitDaemon != null && gitDaemon.isRunning();
+ }
+
+ public boolean isServingSSH() {
+ return sshDaemon != null && sshDaemon.isRunning();
}
protected void configureFederation() {
--
Gitblit v1.9.1