From 97bf49e5642abdef8ca24e31aeeb82e6547ce584 Mon Sep 17 00:00:00 2001
From: abranson <andrew.branson@cern.ch>
Date: Tue, 13 Mar 2012 16:00:10 +0100
Subject: Fix NPE when key doesn't exist

---
 source/com/c2kernel/utils/SoftCache.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source/com/c2kernel')

diff --git a/source/com/c2kernel/utils/SoftCache.java b/source/com/c2kernel/utils/SoftCache.java
index ff71222..2fd79f1 100644
--- a/source/com/c2kernel/utils/SoftCache.java
+++ b/source/com/c2kernel/utils/SoftCache.java
@@ -62,7 +62,8 @@ public class SoftCache<K, V> extends AbstractMap<K, V> {
     @Override
 	public V remove(Object key) {
         processQueue();
-        return hash.remove(key).get();
+        if (hash.containsKey(key)) return hash.remove(key).get();
+        return null;
     }
 
     @Override
-- 
cgit v1.2.3