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/07/14 12:47:02 UTC

svn commit: r1610382 - in /lucene/dev/trunk: ./ lucene/ lucene/test-framework/ lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java

Author: rmuir
Date: Mon Jul 14 10:47:02 2014
New Revision: 1610382

URL: http://svn.apache.org/r1610382
Log:
LUCENE-5810: fix MDW logic around fsync, now that NRTCachingDirectory extends FilterDirectory

Modified:
    lucene/dev/trunk/   (props changed)
    lucene/dev/trunk/lucene/   (props changed)
    lucene/dev/trunk/lucene/test-framework/   (props changed)
    lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java

Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java?rev=1610382&r1=1610381&r2=1610382&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java Mon Jul 14 10:47:02 2014
@@ -192,6 +192,9 @@ public class MockDirectoryWrapper extend
   private boolean mustSync() {
     Directory delegate = in;
     while (delegate instanceof FilterDirectory) {
+      if (delegate instanceof NRTCachingDirectory) {
+        return true;
+      }
       delegate = ((FilterDirectory) delegate).getDelegate();
     }
     return delegate instanceof NRTCachingDirectory;