You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by ja...@apache.org on 2017/12/10 10:11:15 UTC

ant git commit: BZ-58683 Explicitly use LinkOption.NOFOLLOW_LINKS while checking for existence of a file

Repository: ant
Updated Branches:
  refs/heads/master 7cdc6d19e -> 454e4e2f1


BZ-58683 Explicitly use LinkOption.NOFOLLOW_LINKS while checking for existence of a file


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/454e4e2f
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/454e4e2f
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/454e4e2f

Branch: refs/heads/master
Commit: 454e4e2f19bca04c993f399fde3068b7a21b4452
Parents: 7cdc6d1
Author: Jaikiran Pai <ja...@gmail.com>
Authored: Sun Dec 10 15:39:48 2017 +0530
Committer: Jaikiran Pai <ja...@gmail.com>
Committed: Sun Dec 10 15:40:38 2017 +0530

----------------------------------------------------------------------
 src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant/blob/454e4e2f/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java b/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java
index 52d8968..05f0241 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java
@@ -37,6 +37,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
 import java.nio.file.Files;
+import java.nio.file.LinkOption;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -440,7 +441,7 @@ public class Symlink extends DispatchTask {
     private void doLink(String res, String lnk) throws BuildException {
         final Path link = Paths.get(lnk);
         final Path target = Paths.get(res);
-        final boolean alreadyExists = Files.exists(link);
+        final boolean alreadyExists = Files.exists(link, LinkOption.NOFOLLOW_LINKS);
         if (!alreadyExists) {
             // if the path (at which the link is expected to be created) isn't already present
             // then we just go ahead and attempt to symlink