ozeigermann 2004/10/19 04:40:33
Modified: src/share/org/apache/slide/util TxLRUObjectCache.java
Log:
- Added check for global cache to avoid NPE when not enabled
- Fixed depruning as it seemed to add the original key all the time
Revision Changes Path
1.7 +16 -10
jakarta-slide/src/share/org/apache/slide/util/TxLRUObjectCache.java
Index: TxLRUObjectCache.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/util/TxLRUObjectCache.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TxLRUObjectCache.java 9 Aug 2004 22:56:13 -0000 1.6
+++ TxLRUObjectCache.java 19 Oct 2004 11:40:33 -0000 1.7
@@ -330,20 +330,26 @@
}
protected void prune(Map map, Object key, String delimiter) {
+ String prefix = key + delimiter;
for (Iterator it = map.entrySet().iterator(); it.hasNext();) {
Map.Entry entry = (Map.Entry)it.next();
- if (entry.getKey().toString().startsWith(key + delimiter)) {
+ String keyString = entry.getKey().toString();
+ if (keyString.startsWith(prefix)) {
it.remove();
}
}
}
protected void deprune(Set set, Object key, String delimiter) {
- for (Iterator it = globalCache.entrySet().iterator(); it.hasNext();) {
- Map.Entry entry = (Map.Entry)it.next();
- if (entry.getKey().toString().startsWith(key + delimiter)) {
- set.add(key);
- }
+ if (globalCache != null) {
+ String prefix = key + delimiter;
+ for (Iterator it = globalCache.entrySet().iterator(); it.hasNext();) {
+ Map.Entry entry = (Map.Entry) it.next();
+ String keyString = entry.getKey().toString();
+ if (keyString.startsWith(prefix)) {
+ set.add(entry.getKey());
+ }
+ }
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
