You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2012/12/14 14:24:47 UTC
svn commit: r1421844 - in
/httpcomponents/httpclient/trunk/httpclient-cache/src:
main/java/org/apache/http/impl/client/cache/BasicHttpCache.java
test/java/org/apache/http/impl/client/cache/TestCachingExec.java
Author: olegk
Date: Fri Dec 14 13:24:46 2012
New Revision: 1421844
URL: http://svn.apache.org/viewvc?rev=1421844&view=rev
Log:
Follow-up to HTTPCLIENT-1276
Contributed by Francois-Xavier Bonnet <francois-xavier.bonnet at centraliens.net>
Modified:
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicHttpCache.java
httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachingExec.java
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicHttpCache.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicHttpCache.java?rev=1421844&r1=1421843&r2=1421844&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicHttpCache.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicHttpCache.java Fri Dec 14 13:24:46 2012
@@ -196,7 +196,12 @@ class BasicHttpCache implements HttpCach
src = entry;
}
- Resource resource = resourceFactory.copy(requestId, src.getResource());
+ Resource oldResource = entry.getResource();
+ Resource resource = null;
+ if (oldResource != null) {
+ resource = resourceFactory.copy(requestId, entry.getResource());
+ oldResource.dispose();
+ }
Map<String,String> variantMap = new HashMap<String,String>(src.getVariantMap());
variantMap.put(variantKey, variantCacheKey);
return new HttpCacheEntry(
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachingExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachingExec.java?rev=1421844&r1=1421843&r2=1421844&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachingExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachingExec.java Fri Dec 14 13:24:46 2012
@@ -1593,6 +1593,44 @@ public class TestCachingExec {
assertEquals("etag", result2.getFirstHeader("Etag").getValue());
}
+ @Test
+ public void testNotModifiedResponseWithVaryUpdatesCacheEntryWhenNoEntity() throws Exception {
+
+ Date now = new Date();
+
+ impl = new CachingExec(mockBackend, new BasicHttpCache(),CacheConfig.DEFAULT);
+
+ HttpRequestWrapper req1 = HttpRequestWrapper.wrap(new HttpGet("http://foo.example.com/"));
+ req1.addHeader("If-None-Match", "etag");
+
+ HttpRequestWrapper req2 = HttpRequestWrapper.wrap(new HttpGet("http://foo.example.com/"));
+ req2.addHeader("If-None-Match", "etag");
+
+ HttpResponse resp1 = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_NOT_MODIFIED, "Not modified");
+ resp1.setHeader("Date", DateUtils.formatDate(now));
+ resp1.setHeader("Cache-Control","max-age=0");
+ resp1.setHeader("Etag", "etag");
+ resp1.setHeader("Vary", "Accept-Encoding");
+
+ HttpResponse resp2 = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_NOT_MODIFIED, "Not modified");
+ resp2.setHeader("Date", DateUtils.formatDate(now));
+ resp2.setHeader("Cache-Control","max-age=0");
+ resp1.setHeader("Etag", "etag");
+ resp1.setHeader("Vary", "Accept-Encoding");
+
+ backendExpectsAnyRequestAndReturn(resp1);
+ backendExpectsAnyRequestAndReturn(resp2);
+ replayMocks();
+ HttpResponse result1 = impl.execute(route, req1);
+ HttpResponse result2 = impl.execute(route, req2);
+ verifyMocks();
+
+ assertEquals(HttpStatus.SC_NOT_MODIFIED, result1.getStatusLine().getStatusCode());
+ assertEquals("etag", result1.getFirstHeader("Etag").getValue());
+ assertEquals(HttpStatus.SC_NOT_MODIFIED, result2.getStatusLine().getStatusCode());
+ assertEquals("etag", result2.getFirstHeader("Etag").getValue());
+ }
+
private IExpectationSetters<CloseableHttpResponse> backendExpectsAnyRequestAndReturn(
HttpResponse response) throws Exception {
CloseableHttpResponse resp = mockBackend.execute(