From d00a0ca46fcde3e3e580afea6a548b9c12aeac25 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 11 Jul 2012 17:18:02 -0400
Subject: [PATCH] Update to slf4j 1.6.6 and log4j 1.2.17

---
 src/com/gitblit/models/ServerSettings.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/com/gitblit/models/ServerSettings.java b/src/com/gitblit/models/ServerSettings.java
index 3658096..27199b4 100644
--- a/src/com/gitblit/models/ServerSettings.java
+++ b/src/com/gitblit/models/ServerSettings.java
@@ -54,10 +54,16 @@
 	}
 
 	public void add(SettingModel setting) {
-		settings.put(setting.name, setting);
+		if (setting != null) {
+			settings.put(setting.name, setting);
+		}
 	}
 
 	public SettingModel get(String key) {
 		return settings.get(key);
 	}
+	
+	public boolean hasKey(String key) {
+		return settings.containsKey(key);
+	}
 }

--
Gitblit v1.9.1