Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B714010D3E for ; Thu, 2 May 2013 13:04:20 +0000 (UTC) Received: (qmail 49325 invoked by uid 500); 2 May 2013 13:04:19 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 48967 invoked by uid 500); 2 May 2013 13:04:19 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 48506 invoked by uid 99); 2 May 2013 13:04:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 May 2013 13:04:17 +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; Thu, 02 May 2013 13:04:14 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 42D5D2388A2C for ; Thu, 2 May 2013 13:03:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1478358 - in /tomcat/trunk/java/org/apache/coyote/http11: AbstractOutputBuffer.java InternalAprOutputBuffer.java InternalNioOutputBuffer.java InternalOutputBuffer.java Date: Thu, 02 May 2013 13:03:53 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130502130353.42D5D2388A2C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Thu May 2 13:03:52 2013 New Revision: 1478358 URL: http://svn.apache.org/r1478358 Log: Implment a standard isBlocking() method for output Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java?rev=1478358&r1=1478357&r2=1478358&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java Thu May 2 13:03:52 2013 @@ -578,7 +578,6 @@ public abstract class AbstractOutputBuff protected abstract boolean hasDataToWrite(); protected abstract void setBlocking(boolean blocking); - protected abstract boolean isBlocking(); /** * Writes any remaining buffered data. @@ -591,6 +590,14 @@ public abstract class AbstractOutputBuff protected abstract boolean flushBuffer(boolean block) throws IOException; + /** + * Is standard Servlet blocking IO being used for output? + */ + protected final boolean isBlocking() { + return response.getWriteListener() == null; + } + + protected final boolean isReady() { return !hasDataToWrite(); } Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java?rev=1478358&r1=1478357&r2=1478358&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java Thu May 2 13:03:52 2013 @@ -180,13 +180,6 @@ public class InternalAprOutputBuffer ext } - @Override - public boolean isBlocking() { - // TODO - return false; - } - - // ----------------------------------- OutputStreamOutputBuffer Inner Class /** Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java?rev=1478358&r1=1478357&r2=1478358&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java Thu May 2 13:03:52 2013 @@ -366,11 +366,6 @@ public class InternalNioOutputBuffer ext this.bufferedWriteSize = bufferedWriteSize; } - @Override - public boolean isBlocking() { - return bufferedWrite == null; - } - private boolean hasBufferedData() { boolean result = false; if (bufferedWrite!=null) { Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java?rev=1478358&r1=1478357&r2=1478358&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java Thu May 2 13:03:52 2013 @@ -198,13 +198,6 @@ public class InternalOutputBuffer extend @Override - public boolean isBlocking() { - // TODO - return false; - } - - - @Override protected boolean flushBuffer(boolean block) throws IOException { // Blocking connector so ignore block parameter as this will always use // blocking IO. --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org