Description: HttpResponse.getCacheTtl returns time in milliseconds while ttl in cache headers is in seconds, therefore doing the appropriate conversion.
Please review this at http://codereview.appspot.com/2123045/ Affected files: M java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ServletUtil.java M java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletUtilTest.java Index: java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ServletUtil.java =================================================================== --- java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ServletUtil.java (revision 995758) +++ java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ServletUtil.java (working copy) @@ -101,7 +101,7 @@ 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()); } Index: java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletUtilTest.java =================================================================== --- java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletUtilTest.java (revision 995758) +++ java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletUtilTest.java (working copy) @@ -223,6 +223,7 @@ 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
