svn commit: r1662561 - in /lucene/dev/branches/lucene_solr_4_10: ./ lucene/ lucene/core/ lucene/core/src/java/org/apache/lucene/util/IOUtils.java

[us...@apache.org]

Author: uschindler
Date: Thu Feb 26 20:35:01 2015
New Revision: 1662561

URL: http://svn.apache.org/r1662561
Log:
Merged revision(s) 1650391 from lucene/dev/branches/branch_5x:
Merged revision(s) 1650390 from lucene/dev/trunk:
LUCENE-6169: Disable the fsync on directory assert for Java 9+, because in Java 9 opening a FileChannel on directory no longer works

Modified:
    lucene/dev/branches/lucene_solr_4_10/   (props changed)
    lucene/dev/branches/lucene_solr_4_10/lucene/   (props changed)
    lucene/dev/branches/lucene_solr_4_10/lucene/core/   (props changed)
    lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/util/IOUtils.java

Modified: lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/util/IOUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/util/IOUtils.java?rev=1662561&r1=1662560&r2=1662561&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/util/IOUtils.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/util/IOUtils.java Thu Feb 26 20:35:01 2015
@@ -336,7 +336,8 @@ public final class IOUtils {
     }
     
     if (isDir) {
-      assert (Constants.LINUX || Constants.MAC_OS_X) == false :
+      // TODO: LUCENE-6169 - Fix this assert once Java 9 problems are solved!
+      assert (Constants.LINUX || Constants.MAC_OS_X) == false || Constants.JRE_IS_MINIMUM_JAVA9 :
         "On Linux and MacOSX fsyncing a directory should not throw IOException, "+
         "we just don't want to rely on that in production (undocumented). Got: " + exc;
       // Ignore exception if it is a directory