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 2125DD744 for ; Wed, 29 May 2013 19:28:07 +0000 (UTC) Received: (qmail 120 invoked by uid 500); 29 May 2013 19:28:06 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 99957 invoked by uid 500); 29 May 2013 19:28:06 -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 99948 invoked by uid 99); 29 May 2013 19:28:06 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 May 2013 19:28:06 +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, 29 May 2013 19:28:04 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6E3FB23888E7 for ; Wed, 29 May 2013 19:27:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1487604 - /tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Date: Wed, 29 May 2013 19:27:43 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130529192743.6E3FB23888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Wed May 29 19:27:43 2013 New Revision: 1487604 URL: http://svn.apache.org/r1487604 Log: Simplify Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1487604&r1=1487603&r2=1487604&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Wed May 29 19:27:43 2013 @@ -1542,13 +1542,10 @@ public abstract class AbstractHttp11Proc asyncStateMachine.asyncOperation(); try { if (outputBuffer.hasDataToWrite()) { - //System.out.println("Attempting data flush!!"); - outputBuffer.flushBuffer(false); - } - //return if we have more data to write - if (outputBuffer.hasDataToWrite()) { - registerForEvent(false, true); - return SocketState.LONG; + if (outputBuffer.flushBuffer(false)) { + registerForEvent(false, true); + return SocketState.LONG; + } } } catch (IOException x) { if (getLog().isDebugEnabled()) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org