Author: lindner
Date: Tue Sep 28 21:43:50 2010
New Revision: 1002366
URL: http://svn.apache.org/viewvc?rev=1002366&view=rev
Log:
patch from Kuntal Loya | HttpResponse.getCacheTtl returns time in milliseconds
while ttl in cache headers is in seconds
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ServletUtil.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletUtilTest.java
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ServletUtil.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ServletUtil.java?rev=1002366&r1=1002365&r2=1002366&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ServletUtil.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ServletUtil.java
Tue Sep 28 21:43:50 2010
@@ -101,7 +101,7 @@ public final class ServletUtil {
for (Map.Entry<String, String> header : response.getHeaders().entries()) {
servletResponse.addHeader(header.getKey(), header.getValue());
}
- HttpUtil.setCachingHeaders(servletResponse, (int)response.getCacheTtl());
+ HttpUtil.setCachingHeaders(servletResponse, (int)(response.getCacheTtl() /
1000L));
IOUtils.copy(response.getResponse(), servletResponse.getOutputStream());
}
Modified:
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletUtilTest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletUtilTest.java?rev=1002366&r1=1002365&r2=1002366&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletUtilTest.java
(original)
+++
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletUtilTest.java
Tue Sep 28 21:43:50 2010
@@ -223,6 +223,7 @@ public class ServletUtilTest {
assertEquals("response string", recorder.getResponseAsString());
assertEquals("v1", recorder.getHeader("h1"));
assertEquals("v2", recorder.getHeader("h2"));
+ assertEquals("public,max-age=1000", recorder.getHeader("Cache-Control"));
}
@Test
