From a9a2ffcf9a34bd25fe2e05bfdd4cde74725bb17d Mon Sep 17 00:00:00 2001
From: Milos Cubrilo <milos.cubrilo@gmail.com>
Date: Sun, 11 Jan 2015 07:41:29 -0500
Subject: [PATCH] #230 - Improve empty folder navigation.
---
src/main/java/com/gitblit/servlet/GitblitContext.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/gitblit/servlet/GitblitContext.java b/src/main/java/com/gitblit/servlet/GitblitContext.java
index 04a7d92..077624c 100644
--- a/src/main/java/com/gitblit/servlet/GitblitContext.java
+++ b/src/main/java/com/gitblit/servlet/GitblitContext.java
@@ -261,9 +261,13 @@
protected <X extends IManager> X startManager(Injector injector, Class<X> clazz) {
X x = loadManager(injector, clazz);
logManager(clazz);
- x.start();
- managers.add(x);
- return x;
+ return startManager(x);
+ }
+
+ protected <X extends IManager> X startManager(X x) {
+ x.start();
+ managers.add(x);
+ return x;
}
protected void logManager(Class<? extends IManager> clazz) {
@@ -364,12 +368,10 @@
baseFolder.mkdirs();
// try to extract the data folder resource to the baseFolder
- File localSettings = new File(baseFolder, "gitblit.properties");
- if (!localSettings.exists()) {
- extractResources(context, "/WEB-INF/data/", baseFolder);
- }
+ extractResources(context, "/WEB-INF/data/", baseFolder);
// delegate all config to baseFolder/gitblit.properties file
+ File localSettings = new File(baseFolder, "gitblit.properties");
FileSettings fileSettings = new FileSettings(localSettings.getAbsolutePath());
// merge the stored settings into the runtime settings
--
Gitblit v1.9.1