From 4a286829631bd6e69f670ff1ef3e1f22d570b940 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 22 Oct 2011 09:23:10 -0400
Subject: [PATCH] Fixed null pointer in object cache
---
tests/com/gitblit/tests/RpcTests.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/com/gitblit/tests/RpcTests.java b/tests/com/gitblit/tests/RpcTests.java
index 3c2f61f..11a340a 100644
--- a/tests/com/gitblit/tests/RpcTests.java
+++ b/tests/com/gitblit/tests/RpcTests.java
@@ -27,8 +27,8 @@
import com.gitblit.models.FederationProposal;
import com.gitblit.models.FederationSet;
import com.gitblit.models.RepositoryModel;
+import com.gitblit.models.ServerSettings;
import com.gitblit.models.ServerStatus;
-import com.gitblit.models.SettingModel;
import com.gitblit.models.UserModel;
import com.gitblit.utils.RpcUtils;
@@ -207,7 +207,7 @@
}
public void testSettings() throws Exception {
- Map<String, SettingModel> settings = RpcUtils.getSettings(url, account, password.toCharArray());
+ ServerSettings settings = RpcUtils.getSettings(url, account, password.toCharArray());
assertTrue("No settings were retrieved!", settings != null);
}
--
Gitblit v1.9.1