You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@lucene.apache.org by mi...@apache.org on 2008/01/20 19:35:28 UTC
svn commit: r613645 -
/lucene/java/trunk/src/java/org/apache/lucene/index/DocumentsWriter.java
Author: mikemccand
Date: Sun Jan 20 10:35:26 2008
New Revision: 613645
URL: http://svn.apache.org/viewvc?rev=613645&view=rev
Log:
LUCENE-1144: fix NPE during DW.abort after OOM error
Modified:
lucene/java/trunk/src/java/org/apache/lucene/index/DocumentsWriter.java
Modified: lucene/java/trunk/src/java/org/apache/lucene/index/DocumentsWriter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/index/DocumentsWriter.java?rev=613645&r1=613644&r2=613645&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/index/DocumentsWriter.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/index/DocumentsWriter.java Sun Jan 20 10:35:26 2008
@@ -2883,13 +2883,13 @@
}
public void nextBuffer() {
- bufferUpto++;
- if (bufferUpto == buffers.length) {
- byte[][] newBuffers = new byte[(int) (bufferUpto*1.5)][];
- System.arraycopy(buffers, 0, newBuffers, 0, bufferUpto);
+ if (1+bufferUpto == buffers.length) {
+ byte[][] newBuffers = new byte[(int) (buffers.length*1.5)][];
+ System.arraycopy(buffers, 0, newBuffers, 0, buffers.length);
buffers = newBuffers;
}
- buffer = buffers[bufferUpto] = getByteBlock();
+ buffer = buffers[1+bufferUpto] = getByteBlock();
+ bufferUpto++;
byteUpto = 0;
byteOffset += BYTE_BLOCK_SIZE;
@@ -2956,13 +2956,13 @@
}
public void nextBuffer() {
- bufferUpto++;
- if (bufferUpto == buffers.length) {
- char[][] newBuffers = new char[(int) (bufferUpto*1.5)][];
- System.arraycopy(buffers, 0, newBuffers, 0, bufferUpto);
+ if (1+bufferUpto == buffers.length) {
+ char[][] newBuffers = new char[(int) (buffers.length*1.5)][];
+ System.arraycopy(buffers, 0, newBuffers, 0, buffers.length);
buffers = newBuffers;
}
- buffer = buffers[bufferUpto] = getCharBlock();
+ buffer = buffers[1+bufferUpto] = getCharBlock();
+ bufferUpto++;
byteUpto = 0;
byteOffset += CHAR_BLOCK_SIZE;