From d5623a235d54b308280d90920238bf75a2880b84 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 24 Oct 2011 16:32:57 -0400
Subject: [PATCH] Combined-md5 password storage option

---
 src/com/gitblit/models/ObjectCache.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/com/gitblit/models/ObjectCache.java b/src/com/gitblit/models/ObjectCache.java
index 48ede90..57494fb 100644
--- a/src/com/gitblit/models/ObjectCache.java
+++ b/src/com/gitblit/models/ObjectCache.java
@@ -80,6 +80,9 @@
 	}
 
 	public Object remove(String name) {
-		return cache.remove(name).object;
+		if (cache.containsKey(name)) {
+			return cache.remove(name).object;
+		}
+		return null;
 	}
 }

--
Gitblit v1.9.1