Merge

.hgtags-top-repo

@@ -436,3 +436,4 @@ d67a3f1f057f7e31e12f33ebe3667cb73d252268 jdk-10+13
 84777531d994ef70163d35078ec9c4127f2eadb5 jdk-9+176
 a4371edb589c60db01142e45c317adb9ccbcb083 jdk-9+177
 a6c830ee8a6798b186730475e700027cdf4598aa jdk-10+15
+2fe66ca1e2b3c361f949de9cb2894661dc0a3fa2 jdk-10+16

test/lib/jdk/test/lib/util/FileUtils.java

@@ -98,7 +98,7 @@ public final class FileUtils {
         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.");