From 02f5f47eb96320baf55a6cb2e5141360e304b504 Mon Sep 17 00:00:00 2001
From: Erik Brakkee <erik@brakkee.org>
Date: Sat, 17 Jul 2010 21:36:22 +0000
Subject: [PATCH]

---
 .../src/main/java/org/wamblee/cache/CachedObject.java      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/support/general/src/main/java/org/wamblee/cache/CachedObject.java b/support/general/src/main/java/org/wamblee/cache/CachedObject.java
index 87feaf0e..7ec87534 100644
--- a/support/general/src/main/java/org/wamblee/cache/CachedObject.java
+++ b/support/general/src/main/java/org/wamblee/cache/CachedObject.java
@@ -112,7 +112,7 @@ public class CachedObject<KeyType extends Serializable, ValueType extends Serial
 
             synchronized (this) {
                 value = object;
-            }
+            } 
         } catch (Exception e) {
             LOGGER.log(Level.INFO,
                 "Recomputation of cached item failed for key '" + objectKey +
@@ -122,8 +122,9 @@ public class CachedObject<KeyType extends Serializable, ValueType extends Serial
                 computing = false;
             }
         }
-
-        return value;
+        synchronized(this) { 
+            return value; 
+        }
     }
 
     /**
-- 
2.31.1