From d1231c63669f4bc3643985b9032de7f998612e08 Mon Sep 17 00:00:00 2001
From: Jason Pyeron <jpyeron@pdinc.us>
Date: Sun, 19 Aug 2012 21:35:52 -0400
Subject: [PATCH] fixed build to allow builds where a proxy is needed for access to outside resources see: http://ant.apache.org/manual/proxy.html
---
src/com/gitblit/RpcServlet.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/com/gitblit/RpcServlet.java b/src/com/gitblit/RpcServlet.java
index c33bd8a..929e9cc 100644
--- a/src/com/gitblit/RpcServlet.java
+++ b/src/com/gitblit/RpcServlet.java
@@ -49,7 +49,7 @@
private static final long serialVersionUID = 1L;
- public static final int PROTOCOL_VERSION = 2;
+ public static final int PROTOCOL_VERSION = 4;
public RpcServlet() {
super();
@@ -276,7 +276,7 @@
}
} else if (RpcRequest.LIST_SETTINGS.equals(reqType)) {
// return the server's settings
- ServerSettings settings = GitBlit.self().getSettingsModel();
+ ServerSettings settings = GitBlit.self().getSettingsModel();
if (allowAdmin) {
// return all settings
result = settings;
@@ -294,12 +294,12 @@
keys.add(Keys.federation.sets);
}
// build the settings
- ServerSettings managementSettings = new ServerSettings();
+ ServerSettings managementSettings = new ServerSettings();
for (String key : keys) {
managementSettings.add(settings.get(key));
}
if (allowManagement) {
- settings.pushScripts = settings.pushScripts;
+ managementSettings.pushScripts = settings.pushScripts;
}
result = managementSettings;
}
@@ -319,6 +319,13 @@
} else {
response.sendError(notAllowedCode);
}
+ } else if (RpcRequest.CLEAR_REPOSITORY_CACHE.equals(reqType)) {
+ // clear the repository list cache
+ if (allowAdmin) {
+ GitBlit.self().resetRepositoryListCache();
+ } else {
+ response.sendError(notAllowedCode);
+ }
}
// send the result of the request
--
Gitblit v1.9.1