Author: doogie
Date: Thu Apr 1 04:30:38 2010
New Revision: 929812
URL:
http://svn.apache.org/viewvc?rev=929812&view=revLog:
values() shouldn't call get(), as it records a hit count.
Modified:
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/test/UtilCacheTests.java
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java?rev=929812&r1=929811&r2=929812&view=diff==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java Thu Apr 1 04:30:38 2010
@@ -302,7 +302,12 @@ public class UtilCache<K, V> implements
List<V> valuesList = FastList.newInstance();
for (K key: cacheLineTable.keySet()) {
- valuesList.add(this.get(key));
+ CacheLine<V> line = this.getInternal(key, false);
+ if (line == null) {
+ continue;
+ } else {
+ valuesList.add(line.getValue());
+ }
}
return valuesList;
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/test/UtilCacheTests.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/test/UtilCacheTests.java?rev=929812&r1=929811&r2=929812&view=diff==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/test/UtilCacheTests.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/test/UtilCacheTests.java Thu Apr 1 04:30:38 2010
@@ -304,7 +304,7 @@ public class UtilCacheTests extends Gene
assertEquals("get-miss", 10, cache.getMissCountNotFound());
assertEquals("get-miss-total", 10, cache.getMissCountTotal());
- assertEquals("get-hit", 24, cache.getHitCount());
+ assertEquals("get-hit", 12, cache.getHitCount());
assertEquals("remove-hit", 6, cache.getRemoveHitCount());
assertEquals("remove-miss", 10, cache.getRemoveMissCount());
cache.removeListener(gotListener);