Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 23858 invoked from network); 15 Nov 2005 12:03:36 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 15 Nov 2005 12:03:36 -0000 Received: (qmail 28211 invoked by uid 500); 15 Nov 2005 12:03:32 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 28179 invoked by uid 500); 15 Nov 2005 12:03:32 -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 28168 invoked by uid 99); 15 Nov 2005 12:03:32 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Nov 2005 04:03:32 -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; Tue, 15 Nov 2005 04:03:24 -0800 Received: (qmail 23435 invoked by uid 65534); 15 Nov 2005 12:03:11 -0000 Message-ID: <20051115120311.23434.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r344354 - /directory/network/trunk/src/java/org/apache/mina/common/ByteBuffer.java Date: Tue, 15 Nov 2005 12:03:11 -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: Tue Nov 15 04:03:07 2005 New Revision: 344354 URL: http://svn.apache.org/viewcvs?rev=344354&view=rev Log: Resolved issue: DIRMINA-124 - ByteBuffer.getString(...) throws an IllegalStateException * Added more if block to filter empty strings Modified: directory/network/trunk/src/java/org/apache/mina/common/ByteBuffer.java Modified: directory/network/trunk/src/java/org/apache/mina/common/ByteBuffer.java URL: http://svn.apache.org/viewcvs/directory/network/trunk/src/java/org/apache/mina/common/ByteBuffer.java?rev=344354&r1=344353&r2=344354&view=diff ============================================================================== --- directory/network/trunk/src/java/org/apache/mina/common/ByteBuffer.java (original) +++ directory/network/trunk/src/java/org/apache/mina/common/ByteBuffer.java Tue Nov 15 04:03:07 2005 @@ -1086,6 +1086,10 @@ } buf.position( oldPos ); + if( !buf.hasRemaining() ) + { + return ""; + } decoder.reset(); int expectedLength = (int) ( buf.remaining() * decoder.averageCharsPerByte() ); @@ -1195,6 +1199,10 @@ } buf.position( oldPos ); + if( !buf.hasRemaining() ) + { + return ""; + } decoder.reset(); int expectedLength = (int) ( buf.remaining() * decoder.averageCharsPerByte() );