Return-Path: Delivered-To: apmail-hc-commits-archive@www.apache.org Received: (qmail 24651 invoked from network); 29 Aug 2008 16:11:34 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 29 Aug 2008 16:11:34 -0000 Received: (qmail 91833 invoked by uid 500); 29 Aug 2008 16:11:32 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 91809 invoked by uid 500); 29 Aug 2008 16:11:32 -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 91800 invoked by uid 99); 29 Aug 2008 16:11:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Aug 2008 09:11:32 -0700 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; Fri, 29 Aug 2008 16:10:43 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BC8BE238899B; Fri, 29 Aug 2008 09:11:13 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r690311 - in /httpcomponents/httpcore/trunk/module-nio/src: main/java/org/apache/http/nio/protocol/ test/java/org/apache/http/nio/protocol/ Date: Fri, 29 Aug 2008 16:11:12 -0000 To: commits@hc.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080829161113.BC8BE238899B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olegk Date: Fri Aug 29 09:11:12 2008 New Revision: 690311 URL: http://svn.apache.org/viewvc?rev=690311&view=rev Log: Changed throttling protocol handlers to make use of Shared*Buffer#close() method Modified: httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpClientHandler.java httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/protocol/TestThrottlingNHttpHandlers.java Modified: httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpClientHandler.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpClientHandler.java?rev=690311&r1=690310&r2=690311&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpClientHandler.java (original) +++ httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpClientHandler.java Fri Aug 29 09:11:12 2008 @@ -138,7 +138,7 @@ if (connState != null) { synchronized (connState) { - connState.shutdown(); + connState.close(); connState.notifyAll(); } } @@ -636,6 +636,19 @@ this.workerRunning = b; } + public void close() { + try { + this.inbuffer.close(); + } catch (IOException ignore) { + } + try { + this.outbuffer.close(); + } catch (IOException ignore) { + } + this.inputState = SHUTDOWN; + this.outputState = SHUTDOWN; + } + public void shutdown() { this.inbuffer.shutdown(); this.outbuffer.shutdown(); Modified: httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java?rev=690311&r1=690310&r2=690311&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java (original) +++ httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java Fri Aug 29 09:11:12 2008 @@ -155,7 +155,7 @@ if (connState != null) { synchronized (connState) { - connState.shutdown(); + connState.close(); connState.notifyAll(); } } @@ -687,6 +687,19 @@ this.expectationFailure = b; } + public void close() { + try { + this.inbuffer.close(); + } catch (IOException ignore) { + } + try { + this.outbuffer.close(); + } catch (IOException ignore) { + } + this.inputState = SHUTDOWN; + this.outputState = SHUTDOWN; + } + public void shutdown() { this.inbuffer.shutdown(); this.outbuffer.shutdown(); Modified: httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/protocol/TestThrottlingNHttpHandlers.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/protocol/TestThrottlingNHttpHandlers.java?rev=690311&r1=690310&r2=690311&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/protocol/TestThrottlingNHttpHandlers.java (original) +++ httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/protocol/TestThrottlingNHttpHandlers.java Fri Aug 29 09:11:12 2008 @@ -680,8 +680,6 @@ }; - // additional expectation: server-side processing ends with an exception. - final Exception handlerException = new Exception(); HttpRequestHandler requestHandler = new HttpRequestHandler() { public void handle( HttpRequest request, @@ -691,7 +689,6 @@ ((HttpEntityEnclosingRequest) request).getEntity().getContent().read(); response.setStatusCode(HttpStatus.SC_OK); } catch (Exception e){ - handlerException.initCause(e); } } }; @@ -765,10 +762,6 @@ } } - // ensure server-side processing was aborted - assertNotNull(handlerException.getCause()); - assertEquals(InterruptedIOException.class, handlerException.getCause().getClass()); - this.execService.shutdown(); this.execService.awaitTermination(10, TimeUnit.SECONDS);