[commons-io] branch master updated: Repairing build on Linux... reverting old behavior.

[ggregory]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git


The following commit(s) were added to refs/heads/master by this push:
     new 69dc2f2  Repairing build on Linux... reverting old behavior.
69dc2f2 is described below

commit 69dc2f21df9e9ab11d71b6d980a69f719708b29c
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Fri Aug 14 22:50:24 2020 -0400

    Repairing build on Linux... reverting old behavior.
---
 src/main/java/org/apache/commons/io/FileUtils.java      | 2 +-
 src/main/java/org/apache/commons/io/file/PathUtils.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/commons/io/FileUtils.java 
b/src/main/java/org/apache/commons/io/FileUtils.java
index 1a2eea7..c9954ad 100644
--- a/src/main/java/org/apache/commons/io/FileUtils.java
+++ b/src/main/java/org/apache/commons/io/FileUtils.java
@@ -1440,7 +1440,7 @@ public class FileUtils {
     public static void forceDelete(final File file) throws IOException {
         final Counters.PathCounters deleteCounters;
         try {
-            deleteCounters = PathUtils.delete(file.toPath(), 
StandardDeleteOption.OVERRIDE_READ_ONLY);
+            deleteCounters = PathUtils.delete(file.toPath());
         } catch (IOException e) {
             throw new IOException("Unable to delete file: " + file, e);
         }
diff --git a/src/main/java/org/apache/commons/io/file/PathUtils.java 
b/src/main/java/org/apache/commons/io/file/PathUtils.java
index fa82a11..d370ef0 100644
--- a/src/main/java/org/apache/commons/io/file/PathUtils.java
+++ b/src/main/java/org/apache/commons/io/file/PathUtils.java
@@ -360,7 +360,7 @@ public final class PathUtils {
         final boolean exists = Files.exists(file, LinkOption.NOFOLLOW_LINKS);
         final long size = exists ? Files.size(file) : 0;
         if (overrideReadOnly(options) && exists) {
-            setReadOnly(file, false/*, LinkOption.NOFOLLOW_LINKS*/);
+            setReadOnly(file, false, LinkOption.NOFOLLOW_LINKS);
         }
         if (Files.deleteIfExists(file)) {
             pathCounts.getFileCounter().increment();