Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 76280 invoked from network); 23 Dec 2005 11:47:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 23 Dec 2005 11:47:53 -0000 Received: (qmail 227 invoked by uid 500); 23 Dec 2005 11:47:52 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 162 invoked by uid 500); 23 Dec 2005 11:47:52 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 151 invoked by uid 99); 23 Dec 2005 11:47:51 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Dec 2005 03:47:51 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 23 Dec 2005 03:47:51 -0800 Received: (qmail 76053 invoked by uid 65534); 23 Dec 2005 11:47:30 -0000 Message-ID: <20051223114730.76052.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r358795 - /directory/network/trunk/src/java/org/apache/mina/filter/codec/support/SimpleProtocolEncoderOutput.java Date: Fri, 23 Dec 2005 11:47:29 -0000 To: commits@directory.apache.org From: trustin@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: trustin Date: Fri Dec 23 03:47:24 2005 New Revision: 358795 URL: http://svn.apache.org/viewcvs?rev=358795&view=rev Log: Fixed: concurrency issue when user writes messages from multiple threads at the same time Modified: directory/network/trunk/src/java/org/apache/mina/filter/codec/support/SimpleProtocolEncoderOutput.java Modified: directory/network/trunk/src/java/org/apache/mina/filter/codec/support/SimpleProtocolEncoderOutput.java URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/filter/codec/support/SimpleProtocolEncoderOutput.java?rev=358795&r1=358794&r2=358795&view=diff ============================================================================== --- directory/network/trunk/src/java/org/apache/mina/filter/codec/support/SimpleProtocolEncoderOutput.java (original) +++ directory/network/trunk/src/java/org/apache/mina/filter/codec/support/SimpleProtocolEncoderOutput.java Fri Dec 23 03:47:24 2005 @@ -27,12 +27,12 @@ return bufferQueue; } - public void write( ByteBuffer buf ) + public synchronized void write( ByteBuffer buf ) { bufferQueue.push( buf ); } - public void mergeAll() + public synchronized void mergeAll() { int sum = 0; final int size = bufferQueue.size(); @@ -70,7 +70,7 @@ bufferQueue.push(newBuf); } - public WriteFuture flush() + public synchronized WriteFuture flush() { Queue bufferQueue = this.bufferQueue; WriteFuture future = null;