From 65f55e2a2cdbce33ed4d2d7111b49ff00b2fd575 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 06 Aug 2012 17:39:25 -0400
Subject: [PATCH] Drop failed attempt to add user or team (issue 118)
---
src/com/gitblit/RpcServlet.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/com/gitblit/RpcServlet.java b/src/com/gitblit/RpcServlet.java
index c33bd8a..31ee5ad 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 = 3;
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;
}
--
Gitblit v1.9.1