svn commit: r642125 - in /incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http: GadgetRenderer.java GadgetRenderingServlet.java

[lindner]

Author: lindner
Date: Fri Mar 28 01:21:48 2008
New Revision: 642125

URL: http://svn.apache.org/viewvc?rev=642125&view=rev
Log:
Fix condition where an iframe URL had a v= param and nocache=1 param
insure nocache=1 takes precedence in this situation

Modified:
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderer.java
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingServlet.java

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderer.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderer.java?rev=642125&r1=642124&r2=642125&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderer.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderer.java
 Fri Mar 28 01:21:48 2008
@@ -252,11 +252,12 @@
     markup.append(content)
           .append("<script>gadgets.util.runOnLoadHandlers();</script>")
           .append("</body></html>");
-    if (request.getParameter("v") != null) {
+
+    if ("1".equals(request.getParameter("nocache"))) {
+      HttpUtil.setCachingHeaders(response, 0);
+    } else if (request.getParameter("v") != null) {
       // Versioned files get cached indefinitely
       HttpUtil.setCachingHeaders(response);
-    } else if ("1".equals(request.getParameter("nocache"))) {
-      HttpUtil.setCachingHeaders(response, 0);
     } else {
       // Unversioned files get cached for 5 minutes.
       // TODO: This should be configurable

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingServlet.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingServlet.java?rev=642125&r1=642124&r2=642125&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingServlet.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingServlet.java
 Fri Mar 28 01:21:48 2008
@@ -43,6 +43,7 @@
     // not modified. This is because when there actually is a change,
     // cache busting should occur.
     if (req.getHeader("If-Modified-Since") != null &&
+        !"1".equals(req.getParameter("nocache")) &&
         req.getParameter("v") != null) {
       resp.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
       return;