You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2011/11/06 12:25:48 UTC
svn commit: r1198337 - in /lucene/dev/branches/branch_3x/lucene/src:
java/org/apache/lucene/util/PagedBytes.java
test/org/apache/lucene/util/TestPagedBytes.java
Author: mikemccand
Date: Sun Nov 6 11:25:48 2011
New Revision: 1198337
URL: http://svn.apache.org/viewvc?rev=1198337&view=rev
Log:
LUCENE-3563: fix test bug
Modified:
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/util/PagedBytes.java
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/TestPagedBytes.java
Modified: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/util/PagedBytes.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/util/PagedBytes.java?rev=1198337&r1=1198336&r2=1198337&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/util/PagedBytes.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/util/PagedBytes.java Sun Nov 6 11:25:48 2011
@@ -441,6 +441,7 @@ public final class PagedBytes {
@Override
public void readBytes(byte[] b, int offset, int len) {
+ assert b.length >= offset + len;
final int offsetEnd = offset + len;
while (true) {
final int blockLeft = blockSize - currentBlockUpto;
@@ -485,6 +486,7 @@ public final class PagedBytes {
@Override
public void writeBytes(byte[] b, int offset, int length) throws IOException {
+ assert b.length >= offset + length;
if (length == 0) {
return;
}
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/TestPagedBytes.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/TestPagedBytes.java?rev=1198337&r1=1198336&r2=1198337&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/TestPagedBytes.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/util/TestPagedBytes.java Sun Nov 6 11:25:48 2011
@@ -37,7 +37,7 @@ public class TestPagedBytes extends Luce
if (random.nextInt(10) == 7) {
out.writeByte(answer[written++]);
} else {
- int chunk = Math.max(random.nextInt(1000), numBytes - written);
+ int chunk = Math.min(random.nextInt(1000), numBytes - written);
out.writeBytes(answer, written, chunk);
written += chunk;
}
@@ -53,7 +53,7 @@ public class TestPagedBytes extends Luce
if (random.nextInt(10) == 7) {
verify[read++] = in.readByte();
} else {
- int chunk = Math.max(random.nextInt(1000), numBytes - read);
+ int chunk = Math.min(random.nextInt(1000), numBytes - read);
in.readBytes(verify, read, chunk);
read += chunk;
}