Return-Path: Delivered-To: apmail-hc-commits-archive@www.apache.org Received: (qmail 1454 invoked from network); 8 Dec 2010 20:38:17 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 8 Dec 2010 20:38:17 -0000 Received: (qmail 49394 invoked by uid 500); 8 Dec 2010 20:38:17 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 49354 invoked by uid 500); 8 Dec 2010 20:38:17 -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 49347 invoked by uid 99); 8 Dec 2010 20:38:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Dec 2010 20:38:17 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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, 08 Dec 2010 20:38:14 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9EDAC23889DA; Wed, 8 Dec 2010 20:37:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1043664 - in /httpcomponents/httpclient/trunk/httpclient/src: main/java/org/apache/http/impl/cookie/BasicClientCookie2.java test/java/org/apache/http/impl/cookie/TestBasicClientCookie2.java Date: Wed, 08 Dec 2010 20:37:53 -0000 To: commits@hc.apache.org From: sebb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101208203753.9EDAC23889DA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sebb Date: Wed Dec 8 20:37:53 2010 New Revision: 1043664 URL: http://svn.apache.org/viewvc?rev=1043664&view=rev Log: HTTPCLIENT-1031 Cannot clone BasicClientCookie2 without specified ports Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie2.java httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestBasicClientCookie2.java Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie2.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie2.java?rev=1043664&r1=1043663&r2=1043664&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie2.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie2.java Wed Dec 8 20:37:53 2010 @@ -93,7 +93,9 @@ public class BasicClientCookie2 extends @Override public Object clone() throws CloneNotSupportedException { BasicClientCookie2 clone = (BasicClientCookie2) super.clone(); - clone.ports = this.ports.clone(); + if (this.ports != null) { + clone.ports = this.ports.clone(); + } return clone; } Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestBasicClientCookie2.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestBasicClientCookie2.java?rev=1043664&r1=1043663&r2=1043664&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestBasicClientCookie2.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestBasicClientCookie2.java Wed Dec 8 20:37:53 2010 @@ -72,6 +72,21 @@ public class TestBasicClientCookie2 { } @Test + public void testHTTPCLIENT_1031() throws Exception { + BasicClientCookie2 orig = new BasicClientCookie2("name", "value"); + orig.setDomain("domain"); + orig.setPath("/"); + orig.setAttribute("attrib", "stuff"); + BasicClientCookie2 clone = (BasicClientCookie2) orig.clone(); + Assert.assertEquals(orig.getName(), clone.getName()); + Assert.assertEquals(orig.getValue(), clone.getValue()); + Assert.assertEquals(orig.getDomain(), clone.getDomain()); + Assert.assertEquals(orig.getPath(), clone.getPath()); + Assert.assertEquals(orig.getAttribute("attrib"), clone.getAttribute("attrib")); + Assert.assertNull(clone.getPorts()); + } + + @Test public void testSerialization() throws Exception { BasicClientCookie2 orig = new BasicClientCookie2("name", "value"); orig.setDomain("domain");