Return-Path: Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: (qmail 85606 invoked from network); 5 Apr 2011 17:27:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 5 Apr 2011 17:27:23 -0000 Received: (qmail 99292 invoked by uid 500); 5 Apr 2011 17:27:23 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 99268 invoked by uid 500); 5 Apr 2011 17:27:23 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 99260 invoked by uid 99); 5 Apr 2011 17:27:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Apr 2011 17:27:23 +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; Tue, 05 Apr 2011 17:27:21 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D4E1A238890A; Tue, 5 Apr 2011 17:27:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1089139 - /cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/util/MappedFileDataInput.java Date: Tue, 05 Apr 2011 17:27:01 -0000 To: commits@cassandra.apache.org From: slebresne@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110405172701.D4E1A238890A@eris.apache.org> Author: slebresne Date: Tue Apr 5 17:27:01 2011 New Revision: 1089139 URL: http://svn.apache.org/viewvc?rev=1089139&view=rev Log: Convert mmap assertion to if/throw patch by jbellis; reviewed by slebresne for CASSANDRA-2417 Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/util/MappedFileDataInput.java Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/util/MappedFileDataInput.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/util/MappedFileDataInput.java?rev=1089139&r1=1089138&r2=1089139&view=diff ============================================================================== --- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/util/MappedFileDataInput.java (original) +++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/util/MappedFileDataInput.java Tue Apr 5 17:27:01 2011 @@ -114,9 +114,9 @@ public class MappedFileDataInput extends public synchronized ByteBuffer readBytes(int length) throws IOException { int remaining = buffer.remaining() - position; - - assert length <= remaining - : String.format("mmap segment underflow; remaining is %d but %d requested", remaining, length); + if (length > remaining) + throw new IOException(String.format("mmap segment underflow; remaining is %d but %d requested", + remaining, length)); ByteBuffer bytes = buffer.duplicate(); bytes.position(buffer.position() + position).limit(buffer.position() + position + length);