Return-Path: 
 <dev-return-138206-apmail-tomcat-dev-archive=tomcat.apache.org@tomcat.apache.org>
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 D4BD9103EE
	for <apmail-tomcat-dev-archive@www.apache.org>;
 Thu,  2 May 2013 20:56:57 +0000 (UTC)
Received: (qmail 50326 invoked by uid 500); 2 May 2013 20:56:57 -0000
Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org
Received: (qmail 50262 invoked by uid 500); 2 May 2013 20:56:56 -0000
Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@tomcat.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@tomcat.apache.org>
List-Post: <mailto:dev@tomcat.apache.org>
List-Id: <dev.tomcat.apache.org>
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Delivered-To: mailing list dev@tomcat.apache.org
Received: (qmail 50252 invoked by uid 99); 2 May 2013 20:56:56 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 May 2013 20:56:56 +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 20:56:55 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 3A41E23888E7
	for <dev@tomcat.apache.org>; Thu,  2 May 2013 20:56:35 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1478535 -
 /tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
Date: Thu, 02 May 2013 20:56:35 -0000
To: dev@tomcat.apache.org
From: markt@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130502205635.3A41E23888E7@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: markt
Date: Thu May  2 20:56:34 2013
New Revision: 1478535

URL: http://svn.apache.org/r1478535
Log:
Rename for clarity

Modified:
    tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java

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=1478535&r1=1478534&r2=1478535&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java Thu May  2 20:56:34 2013
@@ -88,7 +88,7 @@ public class InternalNioOutputBuffer ext
     /**
      * For "non-blocking" writes use an external buffer.
      */
-    protected volatile LinkedBlockingDeque<ByteBufferHolder> bufferedWrite = null;
+    protected volatile LinkedBlockingDeque<ByteBufferHolder> bufferedWrites = null;
 
     /**
      * The max size of the buffered write buffer
@@ -278,11 +278,11 @@ public class InternalNioOutputBuffer ext
     }
 
     private void addToBuffers(byte[] buf, int offset, int length) {
-        ByteBufferHolder holder = bufferedWrite.peekLast();
+        ByteBufferHolder holder = bufferedWrites.peekLast();
         if (holder==null || holder.isFlipped() || holder.getBuf().remaining()<length) {
             ByteBuffer buffer = ByteBuffer.allocate(Math.max(bufferedWriteSize,length));
             holder = new ByteBufferHolder(buffer,false);
-            bufferedWrite.add(holder);
+            bufferedWrites.add(holder);
         }
         holder.getBuf().put(buf,offset,length);
     }
@@ -310,8 +310,8 @@ public class InternalNioOutputBuffer ext
 
         dataLeft = hasMoreDataToFlush();
 
-        if (!dataLeft && bufferedWrite!=null) {
-            Iterator<ByteBufferHolder> bufIter = bufferedWrite.iterator();
+        if (!dataLeft && bufferedWrites!=null) {
+            Iterator<ByteBufferHolder> bufIter = bufferedWrites.iterator();
             while (!hasMoreDataToFlush() && bufIter.hasNext()) {
                 ByteBufferHolder buffer = bufIter.next();
                 buffer.flip();
@@ -357,9 +357,9 @@ public class InternalNioOutputBuffer ext
     @Override
     public void setBlocking(boolean blocking) {
         if (blocking)
-            bufferedWrite = null;
+            bufferedWrites = null;
         else
-            bufferedWrite = new LinkedBlockingDeque<>();
+            bufferedWrites = new LinkedBlockingDeque<>();
     }
 
     public void setBufferedWriteSize(int bufferedWriteSize) {
@@ -368,8 +368,8 @@ public class InternalNioOutputBuffer ext
 
     private boolean hasBufferedData() {
         boolean result = false;
-        if (bufferedWrite!=null) {
-            Iterator<ByteBufferHolder> iter = bufferedWrite.iterator();
+        if (bufferedWrites!=null) {
+            Iterator<ByteBufferHolder> iter = bufferedWrites.iterator();
             while (!result && iter.hasNext()) {
                 result = iter.next().hasData();
             }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org