From efc892720203b5f4e574d736ea1bd68e0e8ba6c7 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Fri, 25 Jan 2013 20:25:12 +0100
Subject: Fix unsynchronized gap between check and retrieve of memcache object.

---
 src/main/java/com/c2kernel/persistency/ClusterStorageManager.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/com/c2kernel/persistency/ClusterStorageManager.java b/src/main/java/com/c2kernel/persistency/ClusterStorageManager.java
index c49b41f..bb5f90f 100644
--- a/src/main/java/com/c2kernel/persistency/ClusterStorageManager.java
+++ b/src/main/java/com/c2kernel/persistency/ClusterStorageManager.java
@@ -162,8 +162,8 @@ public class ClusterStorageManager {
         C2KLocalObject result = null;
         // check cache first
         NonStrongRefCache<String, C2KLocalObject> sysKeyMemCache = null;
-        if (memoryCache.containsKey(sysKeyIntObj)) {
-            sysKeyMemCache = memoryCache.get(sysKeyIntObj);
+        sysKeyMemCache = memoryCache.get(sysKeyIntObj);
+        if (sysKeyMemCache != null) {
             synchronized(sysKeyMemCache) {
                 C2KLocalObject obj = sysKeyMemCache.get(path);
                 if (obj != null) {
-- 
cgit v1.2.3