Return-Path: X-Original-To: apmail-hc-commits-archive@www.apache.org Delivered-To: apmail-hc-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 65089F571 for ; Wed, 17 Apr 2013 10:19:19 +0000 (UTC) Received: (qmail 389 invoked by uid 500); 17 Apr 2013 10:19:18 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 99997 invoked by uid 500); 17 Apr 2013 10:19:14 -0000 Mailing-List: contact commits-help@hc.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "HttpComponents Project" Delivered-To: mailing list commits@hc.apache.org Received: (qmail 99954 invoked by uid 99); 17 Apr 2013 10:19:13 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Apr 2013 10:19:13 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Apr 2013 10:19:10 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 58B1D238889B for ; Wed, 17 Apr 2013 10:18:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1468823 - in /httpcomponents/httpclient/trunk: RELEASE_NOTES.txt httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicHttpCache.java httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryUpdater.java Date: Wed, 17 Apr 2013 10:18:49 -0000 To: commits@hc.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130417101849.58B1D238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olegk Date: Wed Apr 17 10:18:48 2013 New Revision: 1468823 URL: http://svn.apache.org/r1468823 Log: HTTPCLIENT-1299: (regression) cache incorrectly disposes of the underlying cache resource when storing variant entry (follow-up) Contributed by James Leigh Modified: httpcomponents/httpclient/trunk/RELEASE_NOTES.txt httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicHttpCache.java httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryUpdater.java Modified: httpcomponents/httpclient/trunk/RELEASE_NOTES.txt URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/RELEASE_NOTES.txt?rev=1468823&r1=1468822&r2=1468823&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/RELEASE_NOTES.txt (original) +++ httpcomponents/httpclient/trunk/RELEASE_NOTES.txt Wed Apr 17 10:18:48 2013 @@ -1,6 +1,10 @@ Changes since release 4.3 BETA1 ------------------- +* [HTTPCLIENT-1299] (regression) cache incorrectly disposes of the underlying cache resource + when storing variant entry. + Contributed by James Leigh + * [HTTPCLIENT-1342] Redirects with underscore character in the location hostname cause "java.lang.IllegalArgumentException: Host name may not be null". Contributed by Oleg Kalnichevski 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=1468823&r1=1468822&r2=1468823&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 Wed Apr 17 10:18:48 2013 @@ -199,10 +199,9 @@ class BasicHttpCache implements HttpCach src = entry; } - final Resource oldResource = entry.getResource(); Resource resource = null; - if (oldResource != null) { - resource = resourceFactory.copy(requestId, entry.getResource()); + if (src.getResource() != null) { + resource = resourceFactory.copy(requestId, src.getResource()); } final Map variantMap = new HashMap(src.getVariantMap()); variantMap.put(variantKey, variantCacheKey); Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryUpdater.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryUpdater.java?rev=1468823&r1=1468822&r2=1468823&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryUpdater.java (original) +++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryUpdater.java Wed Apr 17 10:18:48 2013 @@ -87,11 +87,9 @@ class CacheEntryUpdater { Args.check(response.getStatusLine().getStatusCode() == HttpStatus.SC_NOT_MODIFIED, "Response must have 304 status code"); final Header[] mergedHeaders = mergeHeaders(entry, response); - final Resource oldResource = entry.getResource(); Resource resource = null; - if (oldResource != null) { + if (entry.getResource() != null) { resource = resourceFactory.copy(requestId, entry.getResource()); - oldResource.dispose(); } return new HttpCacheEntry( requestDate,