Implement setting removal for configuration settings

1 files changed, 30 insertions, 0 deletions

diff --git a/src/main/java/com/gitblit/WebXmlSettings.java b/src/main/java/com/gitblit/WebXmlSettings.java
index 7ae26975..228c27db 100644
--- a/src/main/java/com/gitblit/WebXmlSettings.java
+++ b/src/main/java/com/gitblit/WebXmlSettings.java
@@ -80,6 +80,36 @@ public class WebXmlSettings extends IStoredSettings {
 	}

 

 	@Override

+	public synchronized boolean saveSettings() {

+		try {

+			Properties props = new Properties();

+			// load pre-existing web-configuration

+			if (overrideFile.exists()) {

+				InputStream is = new FileInputStream(overrideFile);

+				props.load(is);

+				is.close();

+			}

+

+			// put all new settings and persist

+			for (String key : removals) {

+				props.remove(key);

+			}

+			removals.clear();

+			OutputStream os = new FileOutputStream(overrideFile);

+			props.store(os, null);

+			os.close();

+

+			// override current runtime settings

+			properties.clear();

+			properties.putAll(props);

+			return true;

+		} catch (Throwable t) {

+			logger.error("Failed to save settings!", t);

+		}

+		return false;

+	}

+

+	@Override

 	public synchronized boolean saveSettings(Map<String, String> settings) {

 		try {

 			Properties props = new Properties();