From 5200b359257c2ab5e29781c2b05c6092fc8338f8 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 29 Nov 2013 11:05:50 -0500
Subject: [PATCH] Eliminate static singleton calls from user services
---
src/main/java/com/gitblit/FederationClient.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/gitblit/FederationClient.java b/src/main/java/com/gitblit/FederationClient.java
index d34aadb..eae6b94 100644
--- a/src/main/java/com/gitblit/FederationClient.java
+++ b/src/main/java/com/gitblit/FederationClient.java
@@ -29,9 +29,9 @@
/**
* Command-line client to pull federated Gitblit repositories.
- *
+ *
* @author James Moger
- *
+ *
*/
public class FederationClient {
@@ -75,7 +75,7 @@
System.out.println("No Federation Registrations! Nothing to do.");
System.exit(0);
}
-
+
// command-line specified repositories folder
if (!StringUtils.isEmpty(params.repositoriesFolder)) {
settings.overrideSetting(Keys.git.repositoriesFolder, new File(
@@ -83,7 +83,8 @@
}
// configure the Gitblit singleton for minimal, non-server operation
- GitBlit.self().configureContext(settings, baseFolder, false);
+ GitBlit gitblit = new GitBlit(settings, baseFolder);
+ gitblit.configureContext(settings, baseFolder, false);
FederationPullExecutor executor = new FederationPullExecutor(registrations, params.isDaemon);
executor.run();
if (!params.isDaemon) {
--
Gitblit v1.9.1