From b0501c33473771ba8c2f7404f6129aa65a8f203c Mon Sep 17 00:00:00 2001
From: Luca Milanesio <luca.milanesio@gmail.com>
Date: Sat, 29 Nov 2014 11:19:20 -0500
Subject: [PATCH] Allows starting an already instantiated manager
---
src/main/java/com/gitblit/servlet/GitblitContext.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/gitblit/servlet/GitblitContext.java b/src/main/java/com/gitblit/servlet/GitblitContext.java
index 04a7d92..85b4720 100644
--- a/src/main/java/com/gitblit/servlet/GitblitContext.java
+++ b/src/main/java/com/gitblit/servlet/GitblitContext.java
@@ -266,6 +266,12 @@
return x;
}
+ protected <X extends IManager> X startManager(X x) {
+ x.start();
+ managers.add(x);
+ return x;
+ }
+
protected void logManager(Class<? extends IManager> clazz) {
logger.info("");
logger.info("----[{}]----", clazz.getName());
@@ -364,12 +370,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