diff options
author | James Moger <james.moger@gitblit.com> | 2011-10-22 09:23:10 -0400 |
---|---|---|
committer | James Moger <james.moger@gitblit.com> | 2011-10-22 09:23:10 -0400 |
commit | 4a286829631bd6e69f670ff1ef3e1f22d570b940 (patch) | |
tree | 37e1181e2330de25bf57799b8f0edd1604e80fe6 /src | |
parent | 84c1d5c1527183a4e2830deab5b177d880914f1c (diff) | |
download | gitblit-4a286829631bd6e69f670ff1ef3e1f22d570b940.tar.gz gitblit-4a286829631bd6e69f670ff1ef3e1f22d570b940.zip |
Fixed null pointer in object cache
Diffstat (limited to 'src')
-rw-r--r-- | 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 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;
}
}
|