From 9effe1630d97039b3e01cd9b58ed07e75be1d63c Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Mon, 25 Feb 2013 08:40:30 -0500 Subject: [PATCH] Merge pull request #75 from thefake/master --- 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