svn commit: r929822 - /ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/CacheLineTable.java

[doogie-3]

Author: doogie
Date: Thu Apr  1 04:36:35 2010
New Revision: 929822

URL: http://svn.apache.org/viewvc?rev=929822&view=rev
Log:
Don't call get() when removing, so that an lru access is not recorded.

Modified:
    ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/CacheLineTable.java

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/CacheLineTable.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/CacheLineTable.java?rev=929822&r1=929821&r2=929822&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/CacheLineTable.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/CacheLineTable.java Thu Apr  1 04:36:35 2010
@@ -167,16 +167,16 @@ public class CacheLineTable<K, V> implem
             if (Debug.verboseOn()) Debug.logVerbose("In CacheLineTable tried to remove with null key, using NullObject" + this.cacheName, module);
         }
         Object nulledKey = fromKey(key);
-        CacheLine<V> value = this.getNoCheck(nulledKey);
+        CacheLine<V> value = memoryTable.remove(nulledKey);
         if (fileTable != null) {
             try {
+                if (value == null) value = fileTable.get(nulledKey);
                 fileTable.remove(nulledKey);
                 jdbmMgr.commit();
             } catch (IOException e) {
                 Debug.logError(e, module);
             }
         }
-        memoryTable.remove(nulledKey);
         return value;
     }