summaryrefslogtreecommitdiffstats
path: root/src/com/gitblit
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2011-10-22 09:23:10 -0400
committerJames Moger <james.moger@gitblit.com>2011-10-22 09:23:10 -0400
commit4a286829631bd6e69f670ff1ef3e1f22d570b940 (patch)
tree37e1181e2330de25bf57799b8f0edd1604e80fe6 /src/com/gitblit
parent84c1d5c1527183a4e2830deab5b177d880914f1c (diff)
downloadgitblit-4a286829631bd6e69f670ff1ef3e1f22d570b940.tar.gz
gitblit-4a286829631bd6e69f670ff1ef3e1f22d570b940.zip
Fixed null pointer in object cache
Diffstat (limited to 'src/com/gitblit')
-rw-r--r--src/com/gitblit/models/ObjectCache.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/gitblit/models/ObjectCache.java b/src/com/gitblit/models/ObjectCache.java
index 48ede90e..57494fbc 100644
--- a/src/com/gitblit/models/ObjectCache.java
+++ b/src/com/gitblit/models/ObjectCache.java
@@ -80,6 +80,9 @@ public class ObjectCache<X> implements Serializable {
}
public Object remove(String name) {
- return cache.remove(name).object;
+ if (cache.containsKey(name)) {
+ return cache.remove(name).object;
+ }
+ return null;
}
}