From a8bbb8be52c3c97451b97169b28c06a441327d9d Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Tue, 19 Dec 2017 12:53:01 +0100
Subject: [PATCH] try to disable cache conditionally

---
 build.xml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index 0939eb571..c4e3526cb 100644
--- a/build.xml
+++ b/build.xml
@@ -1620,6 +1620,11 @@ ${antunit.reports}
 
   <target name="test-init" depends="probe-offline,check_for_optional_packages">
     <mkdir dir="${build.junit.tmpdir}"/>
+    <condition property="sun.io.useCanonCaches" value="false">
+      <not>
+        <javaversion atleast="9"/>
+      </not>
+    </condition>
     <macrodef name="test-junit">
       <element name="junit-nested" implicit="true" />
       <sequential>
@@ -1665,8 +1670,11 @@ ${antunit.reports}
           <sysproperty key="tests.and.ant.share.classloader"
                        value="${tests.and.ant.share.classloader}"/>
           <sysproperty key="java.io.tmpdir" file="${build.junit.tmpdir}"/>
-          <sysproperty key="sun.io.useCanonCaches" value="false"/>
-          <sysproperty key="sun.io.useCanonPrefixCache" value="false"/>
+          <!-- in Java8 the canonical cache seems to interfere with
+               our symlink tests -->
+          <syspropertyset>
+            <propertyref name="sun.io.useCanonCaches"/>
+          </syspropertyset>
           <classpath>
             <path refid="tests-runtime-classpath"/>
             <pathelement location="${junit.collector.dir}"/>