# HG changeset patch # User duke # Date 1503585003 -7200 # Node ID 89ff0e7a94bd5dae982e14cee68d2c8d05981d70 # Parent 886f599a54e6180ed3e3c529ab632f2ff2bebf60# Parent ddc079e73172c3edee77d0eb51dc16eb16d82080 Merge diff -r 886f599a54e6 -r 89ff0e7a94bd .hgtags-top-repo --- a/.hgtags-top-repo Thu Jul 20 18:17:13 2017 +0000 +++ b/.hgtags-top-repo Thu Aug 24 16:30:03 2017 +0200 @@ -436,3 +436,4 @@ 84777531d994ef70163d35078ec9c4127f2eadb5 jdk-9+176 a4371edb589c60db01142e45c317adb9ccbcb083 jdk-9+177 a6c830ee8a6798b186730475e700027cdf4598aa jdk-10+15 +2fe66ca1e2b3c361f949de9cb2894661dc0a3fa2 jdk-10+16 diff -r 886f599a54e6 -r 89ff0e7a94bd test/lib/jdk/test/lib/util/FileUtils.java --- a/test/lib/jdk/test/lib/util/FileUtils.java Thu Jul 20 18:17:13 2017 +0000 +++ b/test/lib/jdk/test/lib/util/FileUtils.java Thu Aug 24 16:30:03 2017 +0200 @@ -98,7 +98,7 @@ while (true) { try { Files.delete(path); - while (Files.exists(path)) { + while (!Files.notExists(path)) { times++; if (times > MAX_RETRY_DELETE_TIMES) { throw new IOException("File still exists after " + times + " waits.");