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 12C02E000 for ; Wed, 10 Oct 2012 20:51:55 +0000 (UTC) Received: (qmail 25439 invoked by uid 500); 10 Oct 2012 20:51:54 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 25403 invoked by uid 500); 10 Oct 2012 20:51:54 -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 25396 invoked by uid 99); 10 Oct 2012 20:51:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Oct 2012 20:51:54 +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, 10 Oct 2012 20:51:51 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7CB6A23888EA for ; Wed, 10 Oct 2012 20:51:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1396792 - in /httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client: methods/HttpEntityEnclosingRequestBase.java methods/HttpRequestBase.java utils/CloneUtils.java Date: Wed, 10 Oct 2012 20:51:07 -0000 To: commits@hc.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121010205107.7CB6A23888EA@eris.apache.org> Author: olegk Date: Wed Oct 10 20:51:06 2012 New Revision: 1396792 URL: http://svn.apache.org/viewvc?rev=1396792&view=rev Log: CloneUtils cleanup Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpEntityEnclosingRequestBase.java httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestBase.java httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/CloneUtils.java Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpEntityEnclosingRequestBase.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpEntityEnclosingRequestBase.java?rev=1396792&r1=1396791&r2=1396792&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpEntityEnclosingRequestBase.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpEntityEnclosingRequestBase.java Wed Oct 10 20:51:06 2012 @@ -69,7 +69,7 @@ public abstract class HttpEntityEnclosin HttpEntityEnclosingRequestBase clone = (HttpEntityEnclosingRequestBase) super.clone(); if (this.entity != null) { - clone.entity = (HttpEntity) CloneUtils.clone(this.entity); + clone.entity = CloneUtils.cloneObject(this.entity); } return clone; } Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestBase.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestBase.java?rev=1396792&r1=1396791&r2=1396792&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestBase.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestBase.java Wed Oct 10 20:51:06 2012 @@ -42,8 +42,6 @@ import org.apache.http.conn.ClientConnec import org.apache.http.conn.ConnectionReleaseTrigger; import org.apache.http.message.AbstractHttpMessage; import org.apache.http.message.BasicRequestLine; -import org.apache.http.message.HeaderGroup; -import org.apache.http.params.HttpParams; import org.apache.http.params.HttpProtocolParams; /** @@ -234,8 +232,8 @@ public abstract class HttpRequestBase ex clone.abortLock = new ReentrantLock(); clone.aborted = false; clone.cancellable = null; - clone.headergroup = (HeaderGroup) CloneUtils.clone(this.headergroup); - clone.params = (HttpParams) CloneUtils.clone(this.params); + clone.headergroup = CloneUtils.cloneObject(this.headergroup); + clone.params = CloneUtils.cloneObject(this.params); return clone; } Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/CloneUtils.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/CloneUtils.java?rev=1396792&r1=1396791&r2=1396792&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/CloneUtils.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/CloneUtils.java Wed Oct 10 20:51:06 2012 @@ -42,7 +42,11 @@ import org.apache.http.annotation.Immuta @Immutable public class CloneUtils { - public static Object clone(final Object obj) throws CloneNotSupportedException { + /** + * @since 4.3 + */ + @SuppressWarnings("unchecked") + public static T cloneObject(final T obj) throws CloneNotSupportedException { if (obj == null) { return null; } @@ -55,7 +59,7 @@ public class CloneUtils { throw new NoSuchMethodError(ex.getMessage()); } try { - return m.invoke(obj, (Object []) null); + return (T) m.invoke(obj, (Object []) null); } catch (InvocationTargetException ex) { Throwable cause = ex.getCause(); if (cause instanceof CloneNotSupportedException) { @@ -71,6 +75,10 @@ public class CloneUtils { } } + public static Object clone(final Object obj) throws CloneNotSupportedException { + return cloneObject(obj); + } + /** * This class should not be instantiated. */