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

[us...@apache.org]

Author: uschindler
Date: Sun Nov 22 10:35:17 2015
New Revision: 1715620

URL: http://svn.apache.org/viewvc?rev=1715620&view=rev
Log:
Merged revision(s) 1715619 from lucene/dev/trunk:
LUCENE-6169: Remove the Java 9 workaround, as change was reverted in OpenJDK source

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

Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/IOUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/IOUtils.java?rev=1715620&r1=1715619&r2=1715620&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/IOUtils.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/IOUtils.java Sun Nov 22 10:35:17 2015
@@ -392,8 +392,7 @@ public final class IOUtils {
       file.force(true);
     } catch (IOException ioe) {
       if (isDir) {
-        // 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 :
+        assert (Constants.LINUX || Constants.MAC_OS_X) == false :
             "On Linux and MacOSX fsyncing a directory should not throw IOException, "+
                 "we just don't want to rely on that in production (undocumented). Got: " + ioe;
         // Ignore exception if it is a directory