From 37864ade1f2ab700e496394b8032dbba9b97f2c0 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 20 Sep 2012 08:08:21 -0400
Subject: [PATCH] Merge branch 'delete-branch' of https://github.com/ajermakovics/gitblit
---
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