You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2014/04/20 14:04:55 UTC

svn commit: r1588741 - in /lucene/dev/trunk/lucene: codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java core/src/java/org/apache/lucene/store/RAMOutputStream.java

Author: rmuir
Date: Sun Apr 20 12:04:55 2014
New Revision: 1588741

URL: http://svn.apache.org/r1588741
Log:
LUCENE-5621: Let DirectPF and RAMOutputStream wreak havoc together if they like

Modified:
    lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java
    lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/RAMOutputStream.java

Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java?rev=1588741&r1=1588740&r2=1588741&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java Sun Apr 20 12:04:55 2014
@@ -383,6 +383,7 @@ public final class DirectPostingsFormat 
 
           final byte[] payloads;
           if (hasPayloads) {
+            ros.flush();
             payloads = new byte[(int) ros.getFilePointer()];
             ros.writeTo(payloads, 0);
           } else {

Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/RAMOutputStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/RAMOutputStream.java?rev=1588741&r1=1588740&r2=1588741&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/RAMOutputStream.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/store/RAMOutputStream.java Sun Apr 20 12:04:55 2014
@@ -155,7 +155,9 @@ public class RAMOutputStream extends Ind
   }
 
   /** Forces any buffered output to be written. */
-  protected void flush() throws IOException {
+  // TODO: remove 'public'. Something bogus is happening between this guy and DirectPF,
+  // not sure which one (or maybe both?) has the bug.
+  public void flush() throws IOException {
     setFileLength();
   }