changeset 2822:6ffac2137a73

Merge
author prr
date Thu, 27 Jul 2017 12:36:49 -0700
parents 7ddec150df64 5c8c1f071732
children ff0a3ced95bb
files
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Jul 25 14:07:47 2017 -0700
+++ b/.hgtags	Thu Jul 27 12:36:49 2017 -0700
@@ -437,3 +437,5 @@
 a4371edb589c60db01142e45c317adb9ccbcb083 jdk-9+177
 a6c830ee8a6798b186730475e700027cdf4598aa jdk-10+15
 2fe66ca1e2b3c361f949de9cb2894661dc0a3fa2 jdk-10+16
+ec4159ebe7050fcc5dcee8a2d150cf948ecc97db jdk-9+178
+252475ccfd84cc249f8d6faf4b7806b5e2c384ce jdk-9+179
--- a/test/lib/jdk/test/lib/util/FileUtils.java	Tue Jul 25 14:07:47 2017 -0700
+++ b/test/lib/jdk/test/lib/util/FileUtils.java	Thu Jul 27 12:36:49 2017 -0700
@@ -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.");