Return-Path: Delivered-To: apmail-jakarta-httpclient-commits-archive@www.apache.org Received: (qmail 48177 invoked from network); 21 Dec 2005 19:51:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 21 Dec 2005 19:51:06 -0000 Received: (qmail 32936 invoked by uid 500); 21 Dec 2005 19:51:06 -0000 Mailing-List: contact httpclient-commits-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: httpclient-dev@jakarta.apache.org Delivered-To: mailing list httpclient-commits@jakarta.apache.org Received: (qmail 32919 invoked by uid 99); 21 Dec 2005 19:51:05 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Dec 2005 11:51:05 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 21 Dec 2005 11:51:05 -0800 Received: (qmail 47570 invoked by uid 65534); 21 Dec 2005 19:50:45 -0000 Message-ID: <20051221195045.47569.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r358363 - in /jakarta/httpcomponents/trunk: http-client/src/java/org/apache/httpclient/impl/ http-client/src/test/org/apache/httpclient/impl/ http-core/src/java/org/apache/http/impl/ http-core/src/test/org/apache/http/impl/ Date: Wed, 21 Dec 2005 19:50:44 -0000 To: httpclient-commits@jakarta.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: olegk Date: Wed Dec 21 11:50:25 2005 New Revision: 358363 URL: http://svn.apache.org/viewcvs?rev=358363&view=rev Log: Moved AutoCloseInputStream ResponseConsumedWatcher DefaultResponseConsumedWatcher classes from HttpCore to HttpClient Added: jakarta/httpcomponents/trunk/http-client/src/java/org/apache/httpclient/impl/AutoCloseInputStream.java - copied unchanged from r358339, jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/AutoCloseInputStream.java jakarta/httpcomponents/trunk/http-client/src/java/org/apache/httpclient/impl/DefaultResponseConsumedWatcher.java - copied unchanged from r358339, jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/DefaultResponseConsumedWatcher.java jakarta/httpcomponents/trunk/http-client/src/java/org/apache/httpclient/impl/ResponseConsumedWatcher.java - copied unchanged from r358339, jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/ResponseConsumedWatcher.java jakarta/httpcomponents/trunk/http-client/src/test/org/apache/httpclient/impl/TestAutoCloseInputStream.java - copied unchanged from r358339, jakarta/httpcomponents/trunk/http-core/src/test/org/apache/http/impl/TestAutoCloseInputStream.java jakarta/httpcomponents/trunk/http-client/src/test/org/apache/httpclient/impl/TestDefaultResponseConsumedWatcher.java - copied unchanged from r358339, jakarta/httpcomponents/trunk/http-core/src/test/org/apache/http/impl/TestDefaultResponseConsumedWatcher.java Removed: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/AutoCloseInputStream.java jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/DefaultResponseConsumedWatcher.java jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/ResponseConsumedWatcher.java jakarta/httpcomponents/trunk/http-core/src/test/org/apache/http/impl/TestAutoCloseInputStream.java jakarta/httpcomponents/trunk/http-core/src/test/org/apache/http/impl/TestDefaultResponseConsumedWatcher.java Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/DefaultHttpClientConnection.java jakarta/httpcomponents/trunk/http-core/src/test/org/apache/http/impl/TestAllImpl.java Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/DefaultHttpClientConnection.java URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/DefaultHttpClientConnection.java?rev=358363&r1=358362&r2=358363&view=diff ============================================================================== --- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/DefaultHttpClientConnection.java (original) +++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/DefaultHttpClientConnection.java Wed Dec 21 11:50:25 2005 @@ -30,7 +30,6 @@ package org.apache.http.impl; import java.io.IOException; -import java.io.InputStream; import java.net.InetAddress; import java.net.Socket; @@ -363,13 +362,6 @@ protected void readResponseBody( final HttpMutableResponse response) throws HttpException, IOException { HttpMutableEntity entity = this.entitygen.generate(this.datareceiver, response); - // if there is a result - ALWAYS wrap it in an observer which will - // close the underlying stream as soon as it is consumed, and notify - // the watcher that the stream has been consumed. - InputStream instream = entity.getContent(); - instream = new AutoCloseInputStream( - instream, new DefaultResponseConsumedWatcher(this, response)); - entity.setContent(instream); response.setEntity(entity); } Modified: jakarta/httpcomponents/trunk/http-core/src/test/org/apache/http/impl/TestAllImpl.java URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/test/org/apache/http/impl/TestAllImpl.java?rev=358363&r1=358362&r2=358363&view=diff ============================================================================== --- jakarta/httpcomponents/trunk/http-core/src/test/org/apache/http/impl/TestAllImpl.java (original) +++ jakarta/httpcomponents/trunk/http-core/src/test/org/apache/http/impl/TestAllImpl.java Wed Dec 21 11:50:25 2005 @@ -40,10 +40,8 @@ TestSuite suite = new TestSuite(); suite.addTest(TestHeaderGroup.suite()); suite.addTest(TestHttpDataReceiverAndTransmitter.suite()); - suite.addTest(TestAutoCloseInputStream.suite()); suite.addTest(TestDefaultConnectionReuseStrategy.suite()); suite.addTest(TestDefaultEntityGenerator.suite()); - suite.addTest(TestDefaultResponseConsumedWatcher.suite()); suite.addTest(TestBasicRequest.suite()); return suite; }