Author: agilliland
Date: Thu Jan 26 11:04:55 2006
New Revision: 372584
URL: http://svn.apache.org/viewcvs?rev=372584&view=rev
Log:
small fix in cache keys to prevent spaces when categories are part of the key.
Modified:
incubator/roller/trunk/src/org/roller/presentation/filters/FeedCacheFilter.java
incubator/roller/trunk/src/org/roller/presentation/filters/IfModifiedFeedCacheFilter.java
incubator/roller/trunk/src/org/roller/presentation/filters/IfModifiedWeblogPageCacheFilter.java
incubator/roller/trunk/src/org/roller/presentation/filters/WeblogPageCacheFilter.java
Modified:
incubator/roller/trunk/src/org/roller/presentation/filters/FeedCacheFilter.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/filters/FeedCacheFilter.java?rev=372584&r1=372583&r2=372584&view=diff
==============================================================================
---
incubator/roller/trunk/src/org/roller/presentation/filters/FeedCacheFilter.java
(original)
+++
incubator/roller/trunk/src/org/roller/presentation/filters/FeedCacheFilter.java
Thu Jan 26 11:04:55 2006
@@ -204,7 +204,8 @@
if(cat.startsWith("/"))
cat = cat.substring(1).replaceAll("/","_");
- key.append("/").append(cat);
+ // categories may contain spaces, which is not desired
+
key.append("/").append(org.apache.commons.lang.StringUtils.deleteWhitespace(cat));
}
} else {
key.append("/").append(feedRequest.getFlavor());
Modified:
incubator/roller/trunk/src/org/roller/presentation/filters/IfModifiedFeedCacheFilter.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/filters/IfModifiedFeedCacheFilter.java?rev=372584&r1=372583&r2=372584&view=diff
==============================================================================
---
incubator/roller/trunk/src/org/roller/presentation/filters/IfModifiedFeedCacheFilter.java
(original)
+++
incubator/roller/trunk/src/org/roller/presentation/filters/IfModifiedFeedCacheFilter.java
Thu Jan 26 11:04:55 2006
@@ -211,7 +211,8 @@
if(cat.startsWith("/"))
cat = cat.substring(1).replaceAll("/","_");
- key.append("/").append(cat);
+ // categories may contain spaces, which is not desired
+
key.append("/").append(org.apache.commons.lang.StringUtils.deleteWhitespace(cat));
}
} else {
key.append("/").append(feedRequest.getFlavor());
Modified:
incubator/roller/trunk/src/org/roller/presentation/filters/IfModifiedWeblogPageCacheFilter.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/filters/IfModifiedWeblogPageCacheFilter.java?rev=372584&r1=372583&r2=372584&view=diff
==============================================================================
---
incubator/roller/trunk/src/org/roller/presentation/filters/IfModifiedWeblogPageCacheFilter.java
(original)
+++
incubator/roller/trunk/src/org/roller/presentation/filters/IfModifiedWeblogPageCacheFilter.java
Thu Jan 26 11:04:55 2006
@@ -53,7 +53,7 @@
// a unique identifier for this cache, this is used as the prefix for
// roller config properties that apply to this cache
- private static final String CACHE_ID = "cache.ifmodified.page";
+ private static final String CACHE_ID = "cache.ifmodified.weblogpage";
private Cache mCache = null;
@@ -188,7 +188,8 @@
cat = cat.substring(1);
}
- key.append("/").append(cat);
+ // categories may contain spaces, which is not desired
+
key.append("/").append(org.apache.commons.lang.StringUtils.deleteWhitespace(cat));
}
}
Modified:
incubator/roller/trunk/src/org/roller/presentation/filters/WeblogPageCacheFilter.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/filters/WeblogPageCacheFilter.java?rev=372584&r1=372583&r2=372584&view=diff
==============================================================================
---
incubator/roller/trunk/src/org/roller/presentation/filters/WeblogPageCacheFilter.java
(original)
+++
incubator/roller/trunk/src/org/roller/presentation/filters/WeblogPageCacheFilter.java
Thu Jan 26 11:04:55 2006
@@ -213,7 +213,8 @@
cat = cat.substring(1);
}
- key.append("/").append(cat);
+ // categories may contain spaces, which is not desired
+
key.append("/").append(org.apache.commons.lang.StringUtils.deleteWhitespace(cat));
}
}
