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 E604410EF6 for ; Tue, 9 Dec 2014 20:20:15 +0000 (UTC) Received: (qmail 98104 invoked by uid 500); 9 Dec 2014 20:20:15 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 98064 invoked by uid 500); 9 Dec 2014 20:20:15 -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 98055 invoked by uid 99); 9 Dec 2014 20:20:15 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Dec 2014 20:20:15 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id E7AFDAC10C3 for ; Tue, 9 Dec 2014 20:20:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1644165 - in /httpcomponents/httpclient/trunk/httpclient/src: main/java/org/apache/http/impl/cookie/BasicClientCookie.java test/java/org/apache/http/impl/cookie/TestCookieRFC2109Spec.java Date: Tue, 09 Dec 2014 20:20:06 -0000 To: commits@hc.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20141209202010.E7AFDAC10C3@hades.apache.org> Author: olegk Date: Tue Dec 9 20:20:06 2014 New Revision: 1644165 URL: http://svn.apache.org/r1644165 Log: Corrected handling of cookie attributes with null value Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestCookieRFC2109Spec.java Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java?rev=1644165&r1=1644164&r2=1644165&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java Tue Dec 9 20:20:06 2014 @@ -315,7 +315,14 @@ public class BasicClientCookie implement @Override public boolean containsAttribute(final String name) { - return this.attribs.get(name) != null; + return this.attribs.containsKey(name); + } + + /** + * @since 4.4 + */ + public boolean removeAttribute(final String name) { + return this.attribs.remove(name) != null; } @Override Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestCookieRFC2109Spec.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestCookieRFC2109Spec.java?rev=1644165&r1=1644164&r2=1644165&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestCookieRFC2109Spec.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestCookieRFC2109Spec.java Tue Dec 9 20:20:06 2014 @@ -399,8 +399,8 @@ public class TestCookieRFC2109Spec { Assert.assertEquals(1, headers.size()); Assert.assertEquals("$Version=0; name=; $Path=/", headers.get(0).getValue()); - cookie.setAttribute(ClientCookie.DOMAIN_ATTR, null); - cookie.setAttribute(ClientCookie.PATH_ATTR, null); + cookie.removeAttribute(ClientCookie.DOMAIN_ATTR); + cookie.removeAttribute(ClientCookie.PATH_ATTR); cookies = new ArrayList(); cookies.add(cookie); headers = cookiespec.formatCookies(cookies);