You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by ss...@apache.org on 2013/02/25 13:35:54 UTC
svn commit: r1449683 - in
/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets:
js/IfModifiedSinceProcessor.java servlet/JsServlet.java
Author: ssievers
Date: Mon Feb 25 12:35:54 2013
New Revision: 1449683
URL: http://svn.apache.org/r1449683
Log:
SHINDIG-1904 | set response cache control to -1 for JsServlet when response code is 304 | Patch from Marshall Shi. Thanks!
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/IfModifiedSinceProcessor.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/IfModifiedSinceProcessor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/IfModifiedSinceProcessor.java?rev=1449683&r1=1449682&r2=1449683&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/IfModifiedSinceProcessor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/IfModifiedSinceProcessor.java Mon Feb 25 12:35:54 2013
@@ -20,6 +20,9 @@ package org.apache.shindig.gadgets.js;
import org.apache.shindig.gadgets.uri.UriStatus;
+import com.google.inject.Inject;
+import com.google.inject.name.Named;
+
import javax.servlet.http.HttpServletResponse;
/**
@@ -29,10 +32,22 @@ import javax.servlet.http.HttpServletRes
*/
public class IfModifiedSinceProcessor implements JsProcessor {
+ public static final int DEFAULT_VERSIONED_MAXAGE = -1;
+
+ private int versionedMaxAge = DEFAULT_VERSIONED_MAXAGE;
+
+ @Inject(optional=true)
+ public void setVersionedMaxAge(@Named("shindig.jscontent.versioned.maxage") Integer maxAge) {
+ if (maxAge != null) {
+ versionedMaxAge = maxAge;
+ }
+ }
+
public boolean process(JsRequest request, JsResponseBuilder builder) {
if (request.isInCache() &&
request.getJsUri().getStatus() == UriStatus.VALID_VERSIONED) {
builder.setStatusCode(HttpServletResponse.SC_NOT_MODIFIED);
+ builder.setCacheTtlSecs(versionedMaxAge);
return false;
}
return true;
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java?rev=1449683&r1=1449682&r2=1449683&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java Mon Feb 25 12:35:54 2013
@@ -102,11 +102,13 @@ public class JsServlet extends InjectedS
protected void emitJsResponse(JsResponse jsResponse, HttpServletRequest req,
HttpServletResponse resp) throws IOException {
- if (jsResponse.getStatusCode() == 304) {
+ if (jsResponse.getStatusCode() == HttpServletResponse.SC_NOT_MODIFIED) {
resp.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
+ cachingSetter.setCachingHeaders(
+ resp, jsResponse.getCacheTtlSecs(), !jsResponse.isProxyCacheable());
return;
}
- if (jsResponse.getStatusCode() == 200 && jsResponse.toJsString().length() == 0) {
+ if (jsResponse.getStatusCode() == HttpServletResponse.SC_OK && jsResponse.toJsString().length() == 0) {
resp.setStatus(HttpServletResponse.SC_NOT_FOUND);
return;
}