From 1aec17636d8c548257cb307f8cc1e41354e00421 Mon Sep 17 00:00:00 2001
From: marco <mw.sunshine@gmx.de>
Date: Mon, 23 Nov 2015 13:58:14 -0500
Subject: [PATCH] Fix 2 possible NullPointer occurences
---
src/test/java/com/gitblit/tests/mock/MemorySettings.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/test/java/com/gitblit/tests/mock/MemorySettings.java b/src/test/java/com/gitblit/tests/mock/MemorySettings.java
index 1b3e238..673d3f2 100644
--- a/src/test/java/com/gitblit/tests/mock/MemorySettings.java
+++ b/src/test/java/com/gitblit/tests/mock/MemorySettings.java
@@ -16,15 +16,20 @@
*/
package com.gitblit.tests.mock;
+import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
import com.gitblit.IStoredSettings;
public class MemorySettings extends IStoredSettings {
-
+
private Map<String, Object> backingMap;
-
+
+ public MemorySettings() {
+ this(new HashMap<String, Object>());
+ }
+
public MemorySettings(Map<String, Object> backingMap) {
super(MemorySettings.class);
this.backingMap = backingMap;
@@ -34,12 +39,17 @@
protected Properties read() {
Properties props = new Properties();
props.putAll(backingMap);
-
+
return props;
}
-
- public void put(Object key, Object value) {
- backingMap.put(key.toString(), value);
+
+ public void put(String key, Object value) {
+ backingMap.put(key, value);
+ }
+
+ @Override
+ public boolean saveSettings() {
+ return false;
}
@Override
--
Gitblit v1.9.1