cvs commit: jakarta-commons-sandbox/simplestore/src/java/org/apache/commons/simplestore SoftRefMemoryStore.java

[froehlich]

froehlich    02/01/20 06:20:22

  Modified:    simplestore/src/java/org/apache/commons/simplestore
                        SoftRefMemoryStore.java
  Log:
  now I understand ;)
  
  Revision  Changes    Path
  1.4       +17 -11    
jakarta-commons-sandbox/simplestore/src/java/org/apache/commons/simplestore/SoftRefMemoryStore.java
  
  Index: SoftRefMemoryStore.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons-sandbox/simplestore/src/java/org/apache/commons/simplestore/SoftRefMemoryStore.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SoftRefMemoryStore.java   20 Jan 2002 12:24:40 -0000      1.3
  +++ SoftRefMemoryStore.java   20 Jan 2002 14:20:22 -0000      1.4
  @@ -20,7 +20,7 @@
    *      [EMAIL PROTECTED]</a>
    * @author Gerhard Froehlich <a href="mailto:[EMAIL PROTECTED]";>
    *      [EMAIL PROTECTED]</a>
  - * @version $Id: SoftRefMemoryStore.java,v 1.3 2002/01/20 12:24:40 froehlich Exp $
  + * @version $Id: SoftRefMemoryStore.java,v 1.4 2002/01/20 14:20:22 froehlich Exp $
    */
   public class SoftRefMemoryStore
   implements Store {
  @@ -88,7 +88,7 @@
        * Returns the list of used keys as an Enumeration of Objects.
        */
       public Set keySet() {
  -        return map.keySet();
  +        return store.keySet();
       }
       
       /**
  @@ -98,7 +98,7 @@
        */
       public Object remove(Object key) {
           removeSoftRef();
  -        map.remove(key);
  +        store.remove(key);
           return null;
       }
       
  @@ -109,7 +109,7 @@
        */
       public boolean containsKey(Object key) {
           removeSoftRef();
  -        return map.containsKey(key);
  +        return store.containsKey(key);
       }
       
       /**
  @@ -129,6 +129,7 @@
        */
       public Object put(Object key, Object object) {
           removeSoftRef();
  +        store.put(key,object);
           internalStoreObject(key,object);
           return null;
       }
  @@ -146,36 +147,41 @@
           if(ref != null) {
               object = ref.get();
           }
  +        
  +        if(object == null) {
  +            object = store.get(key);
  +        }
  +
           internalStoreObject(key,object);
           return object;
       }
       
       public boolean containsValue(Object value) {
  -        return map.containsValue(value); 
  +        return store.containsValue(value); 
       }
       
       public boolean isEmpty()  {
  -        return map.isEmpty();  
  +        return store.isEmpty();  
       }
       
       public int size()  {
  -        return map.size();  
  +        return store.size();  
       }
       
       public void putAll(Map t)  {
  -        map.putAll(t);
  +        store.putAll(t);
       }
       
       public void clear()  {
  -        map.clear();
  +        store.clear();
       }
       
       public Collection values()  {
  -        return map.values();
  +        return store.values();
       }
       
       public Set entrySet()  {
  -        return map.entrySet();
  +        return store.entrySet();
       }
       
       public Store getNextStore() {
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>