Author: snoopdave
Date: Sun Nov 20 14:52:13 2011
New Revision: 1204176
URL: http://svn.apache.org/viewvc?rev=1204176&view=rev
Log:
Adding device type to cache key formation for PageServlet
Modified:
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogPageCache.java
Modified:
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java?rev=1204176&r1=1204175&r2=1204176&view=diff
==============================================================================
---
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java
(original)
+++
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java
Sun Nov 20 14:52:13 2011
@@ -252,7 +252,9 @@ public class SiteWideCache implements Ca
if(pageRequest.getAuthenticUser() != null) {
key.append("/user=").append(pageRequest.getAuthenticUser());
}
-
+
+
key.append("/deviceType=").append(pageRequest.getDeviceType().toString());
+
// we allow for arbitrary query params for custom pages
if(pageRequest.getCustomParams().size() > 0) {
String queryString = paramsToString(pageRequest.getCustomParams());
Modified:
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogPageCache.java
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogPageCache.java?rev=1204176&r1=1204175&r2=1204176&view=diff
==============================================================================
---
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogPageCache.java
(original)
+++
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogPageCache.java
Sun Nov 20 14:52:13 2011
@@ -225,6 +225,8 @@ public class WeblogPageCache {
key.append("/user=").append(pageRequest.getAuthenticUser());
}
+
key.append("/deviceType=").append(pageRequest.getDeviceType().toString());
+
// we allow for arbitrary query params for custom pages
if(pageRequest.getWeblogPageName() != null &&
pageRequest.getCustomParams().size() > 0) {
