ozeigermann 2004/10/19 00:37:22
Modified: src/share/org/apache/slide/util Tag:
SLIDE_2_1_RELEASE_BRANCH TxLRUObjectCache.java
Log:
Added check for global cache to avoid NPE when not enabled
Revision Changes Path
No revision
No revision
1.6.2.2 +11 -9
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.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- TxLRUObjectCache.java 19 Oct 2004 07:33:08 -0000 1.6.2.1
+++ TxLRUObjectCache.java 19 Oct 2004 07:37:21 -0000 1.6.2.2
@@ -339,11 +339,13 @@
}
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(entry.getKey());
- }
+ if (globalCache != null) {
+ for (Iterator it = globalCache.entrySet().iterator(); it.hasNext();) {
+ Map.Entry entry = (Map.Entry) it.next();
+ if (entry.getKey().toString().startsWith(key + delimiter)) {
+ set.add(entry.getKey());
+ }
+ }
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
