From 80c3ef7b8fd0daee7e85beb6b10f8a7a40efb3de Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 17 Apr 2014 23:08:07 -0400
Subject: [PATCH] [findbugs] Null check on logging merge change in patchset receive pack
---
src/main/java/com/gitblit/manager/RuntimeManager.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/gitblit/manager/RuntimeManager.java b/src/main/java/com/gitblit/manager/RuntimeManager.java
index 45d1ea1..9805701 100644
--- a/src/main/java/com/gitblit/manager/RuntimeManager.java
+++ b/src/main/java/com/gitblit/manager/RuntimeManager.java
@@ -116,7 +116,9 @@
*/
@Override
public boolean isServingRepositories() {
- return settings.getBoolean(Keys.git.enableGitServlet, true) || (settings.getInteger(Keys.git.daemonPort, 0) > 0);
+ return settings.getBoolean(Keys.git.enableGitServlet, true)
+ || (settings.getInteger(Keys.git.daemonPort, 0) > 0)
+ || (settings.getInteger(Keys.git.sshPort, 0) > 0);
}
/**
--
Gitblit v1.9.1