Return-Path: Delivered-To: apmail-hc-commits-archive@www.apache.org Received: (qmail 30424 invoked from network); 15 Jul 2010 20:09:35 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 15 Jul 2010 20:09:35 -0000 Received: (qmail 62547 invoked by uid 500); 15 Jul 2010 20:09:35 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 62506 invoked by uid 500); 15 Jul 2010 20:09:35 -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 62498 invoked by uid 99); 15 Jul 2010 20:09:35 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Jul 2010 20:09:35 +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; Thu, 15 Jul 2010 20:09:31 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4969E23889DD; Thu, 15 Jul 2010 20:08:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r964559 - in /httpcomponents/httpcore/trunk: httpcore-nio/src/main/java/org/apache/http/impl/nio/ httpcore/src/main/java/org/apache/http/impl/ httpcore/src/main/java/org/apache/http/impl/io/ Date: Thu, 15 Jul 2010 20:08:08 -0000 To: commits@hc.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100715200808.4969E23889DD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olegk Date: Thu Jul 15 20:08:07 2010 New Revision: 964559 URL: http://svn.apache.org/viewvc?rev=964559&view=rev Log: HTTPCORE-230: added protected create methods for HttpConnectionMetricsImpl and HttpTransportMetricsImpl classes Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpConnectionBase.java httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/AbstractHttpClientConnection.java httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/AbstractHttpServerConnection.java httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/AbstractSessionInputBuffer.java httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/AbstractSessionOutputBuffer.java Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpConnectionBase.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpConnectionBase.java?rev=964559&r1=964558&r2=964559&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpConnectionBase.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpConnectionBase.java Thu Jul 15 20:08:07 2010 @@ -60,6 +60,7 @@ import org.apache.http.impl.nio.codecs.L import org.apache.http.impl.nio.codecs.LengthDelimitedEncoder; import org.apache.http.impl.nio.reactor.SessionInputBufferImpl; import org.apache.http.impl.nio.reactor.SessionOutputBufferImpl; +import org.apache.http.io.HttpTransportMetrics; import org.apache.http.nio.reactor.EventMask; import org.apache.http.nio.reactor.IOSession; import org.apache.http.nio.reactor.SessionBufferStatus; @@ -143,9 +144,9 @@ public class NHttpConnectionBase this.incomingContentStrategy = new LaxContentLengthStrategy(); this.outgoingContentStrategy = new StrictContentLengthStrategy(); - this.inTransportMetrics = new HttpTransportMetricsImpl(); - this.outTransportMetrics = new HttpTransportMetricsImpl(); - this.connMetrics = new HttpConnectionMetricsImpl( + this.inTransportMetrics = createTransportMetrics(); + this.outTransportMetrics = createTransportMetrics(); + this.connMetrics = createConnectionMetrics( this.inTransportMetrics, this.outTransportMetrics); @@ -154,6 +155,22 @@ public class NHttpConnectionBase this.status = ACTIVE; } + /** + * @since 4.1 + */ + protected HttpTransportMetricsImpl createTransportMetrics() { + return new HttpTransportMetricsImpl(); + } + + /** + * @since 4.1 + */ + protected HttpConnectionMetricsImpl createConnectionMetrics( + final HttpTransportMetrics inTransportMetric, + final HttpTransportMetrics outTransportMetric) { + return new HttpConnectionMetricsImpl(inTransportMetric, outTransportMetric); + } + public int getStatus() { return this.status; } Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/AbstractHttpClientConnection.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/AbstractHttpClientConnection.java?rev=964559&r1=964558&r2=964559&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/AbstractHttpClientConnection.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/AbstractHttpClientConnection.java Thu Jul 15 20:08:07 2010 @@ -47,6 +47,7 @@ import org.apache.http.impl.io.HttpRespo import org.apache.http.io.EofSensor; import org.apache.http.io.HttpMessageParser; import org.apache.http.io.HttpMessageWriter; +import org.apache.http.io.HttpTransportMetrics; import org.apache.http.io.SessionInputBuffer; import org.apache.http.io.SessionOutputBuffer; import org.apache.http.message.LineFormatter; @@ -185,6 +186,15 @@ public abstract class AbstractHttpClient } /** + * @since 4.1 + */ + protected HttpConnectionMetricsImpl createConnectionMetrics( + final HttpTransportMetrics inTransportMetric, + final HttpTransportMetrics outTransportMetric) { + return new HttpConnectionMetricsImpl(inTransportMetric, outTransportMetric); + } + + /** * Initializes this connection object with {@link SessionInputBuffer} and * {@link SessionOutputBuffer} instances to be used for sending and * receiving data. These session buffers can be bound to any arbitrary @@ -221,7 +231,7 @@ public abstract class AbstractHttpClient params); this.requestWriter = createRequestWriter( outbuffer, params); - this.metrics = new HttpConnectionMetricsImpl( + this.metrics = createConnectionMetrics( inbuffer.getMetrics(), outbuffer.getMetrics()); } Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/AbstractHttpServerConnection.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/AbstractHttpServerConnection.java?rev=964559&r1=964558&r2=964559&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/AbstractHttpServerConnection.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/AbstractHttpServerConnection.java Thu Jul 15 20:08:07 2010 @@ -47,6 +47,7 @@ import org.apache.http.impl.io.HttpRespo import org.apache.http.io.EofSensor; import org.apache.http.io.HttpMessageParser; import org.apache.http.io.HttpMessageWriter; +import org.apache.http.io.HttpTransportMetrics; import org.apache.http.io.SessionInputBuffer; import org.apache.http.io.SessionOutputBuffer; import org.apache.http.message.LineFormatter; @@ -185,6 +186,15 @@ public abstract class AbstractHttpServer } /** + * @since 4.1 + */ + protected HttpConnectionMetricsImpl createConnectionMetrics( + final HttpTransportMetrics inTransportMetric, + final HttpTransportMetrics outTransportMetric) { + return new HttpConnectionMetricsImpl(inTransportMetric, outTransportMetric); + } + + /** * Initializes this connection object with {@link SessionInputBuffer} and * {@link SessionOutputBuffer} instances to be used for sending and * receiving data. These session buffers can be bound to any arbitrary @@ -221,7 +231,7 @@ public abstract class AbstractHttpServer params); this.responseWriter = createResponseWriter( outbuffer, params); - this.metrics = new HttpConnectionMetricsImpl( + this.metrics = createConnectionMetrics( inbuffer.getMetrics(), outbuffer.getMetrics()); } Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/AbstractSessionInputBuffer.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/AbstractSessionInputBuffer.java?rev=964559&r1=964558&r2=964559&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/AbstractSessionInputBuffer.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/AbstractSessionInputBuffer.java Thu Jul 15 20:08:07 2010 @@ -102,7 +102,14 @@ public abstract class AbstractSessionInp || this.charset.equalsIgnoreCase(HTTP.ASCII); this.maxLineLen = params.getIntParameter(CoreConnectionPNames.MAX_LINE_LENGTH, -1); this.minChunkLimit = params.getIntParameter(CoreConnectionPNames.MIN_CHUNK_LIMIT, 512); - this.metrics = new HttpTransportMetricsImpl(); + this.metrics = createTransportMetrics(); + } + + /** + * @since 4.1 + */ + protected HttpTransportMetricsImpl createTransportMetrics() { + return new HttpTransportMetricsImpl(); } /** Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/AbstractSessionOutputBuffer.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/AbstractSessionOutputBuffer.java?rev=964559&r1=964558&r2=964559&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/AbstractSessionOutputBuffer.java (original) +++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/AbstractSessionOutputBuffer.java Thu Jul 15 20:08:07 2010 @@ -94,12 +94,19 @@ public abstract class AbstractSessionOut this.ascii = this.charset.equalsIgnoreCase(HTTP.US_ASCII) || this.charset.equalsIgnoreCase(HTTP.ASCII); this.minChunkLimit = params.getIntParameter(CoreConnectionPNames.MIN_CHUNK_LIMIT, 512); - this.metrics = new HttpTransportMetricsImpl(); + this.metrics = createTransportMetrics(); } /** * @since 4.1 */ + protected HttpTransportMetricsImpl createTransportMetrics() { + return new HttpTransportMetricsImpl(); + } + + /** + * @since 4.`1 + */ public int capacity() { return this.buffer.capacity(); }