From dev-return-195051-archive-asf-public=cust-asf.ponee.io@tomcat.apache.org Fri Nov 23 20:50:36 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 024A3180660 for ; Fri, 23 Nov 2018 20:50:35 +0100 (CET) Received: (qmail 41411 invoked by uid 500); 23 Nov 2018 19:50:34 -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 41400 invoked by uid 99); 23 Nov 2018 19:50:34 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Nov 2018 19:50:34 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 296D63A0110 for ; Fri, 23 Nov 2018 19:50:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1847310 - /tomcat/trunk/java/org/apache/coyote/http2/Stream.java Date: Fri, 23 Nov 2018 19:50:33 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20181123195034.296D63A0110@svn01-us-west.apache.org> Author: markt Date: Fri Nov 23 19:50:33 2018 New Revision: 1847310 URL: http://svn.apache.org/viewvc?rev=1847310&view=rev Log: Simplify code Modified: tomcat/trunk/java/org/apache/coyote/http2/Stream.java Modified: tomcat/trunk/java/org/apache/coyote/http2/Stream.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Stream.java?rev=1847310&r1=1847309&r2=1847310&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http2/Stream.java (original) +++ tomcat/trunk/java/org/apache/coyote/http2/Stream.java Fri Nov 23 19:50:33 2018 @@ -733,7 +733,8 @@ class Stream extends AbstractStream impl throw new IllegalStateException( sm.getString("stream.closed", getConnectionId(), getIdentifier())); } - int totalThisTime = 0; + // chunk is always fully written + int result = chunk.remaining(); if (writeBuffer.isEmpty()) { int chunkLimit = chunk.limit(); while (chunk.remaining() > 0) { @@ -741,23 +742,20 @@ class Stream extends AbstractStream impl chunk.limit(chunk.position() + thisTime); buffer.put(chunk); chunk.limit(chunkLimit); - totalThisTime += thisTime; if (chunk.remaining() > 0 && !buffer.hasRemaining()) { // Only flush if we have more data to write and the buffer // is full if (flush(true, coyoteResponse.getWriteListener() == null)) { - totalThisTime += chunk.remaining(); writeBuffer.add(chunk); break; } } } } else { - totalThisTime = chunk.remaining(); writeBuffer.add(chunk); } - written += totalThisTime; - return totalThisTime; + written += result; + return result; } final synchronized boolean flush(boolean block) throws IOException { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org