From d76f44e7c6c79e3cbeb9bf1362e1194dd0aff71c Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 17 Oct 2011 16:00:04 +0200 Subject: [PATCH] Ignore non-existing files in SymLinkUtil --- .../intellij/openapi/util/io/SymLinkUtil.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/platform/util/src/com/intellij/openapi/util/io/SymLinkUtil.java b/platform/util/src/com/intellij/openapi/util/io/SymLinkUtil.java index bed8ed9f0cd9..25f265376c04 100644 --- a/platform/util/src/com/intellij/openapi/util/io/SymLinkUtil.java +++ b/platform/util/src/com/intellij/openapi/util/io/SymLinkUtil.java @@ -68,12 +68,8 @@ public class SymLinkUtil { private SymLinkUtil() { } public static boolean isSymLink(@NotNull final File file) { - return isSymLink(file.getAbsolutePath()); - } - - public static boolean isSymLink(@NotNull final String path) { try { - return ourMediator != null && ourMediator.isSymLink(path); + return file.exists() && ourMediator != null && ourMediator.isSymLink(file.getAbsolutePath()); } catch (Exception e) { LOG.warn(e); @@ -81,16 +77,15 @@ public class SymLinkUtil { } } - @Nullable - public static String resolveSymLink(@NotNull final File file) { - return resolveSymLink(file.getAbsolutePath()); + public static boolean isSymLink(@NotNull final String path) { + return isSymLink(new File(path)); } @Nullable - public static String resolveSymLink(@NotNull final String path) { - if (ourMediator != null) { + public static String resolveSymLink(@NotNull final File file) { + if (file.exists() && ourMediator != null) { try { - final String realPath = ourMediator.resolveSymLink(path); + final String realPath = ourMediator.resolveSymLink(file.getAbsolutePath()); if (realPath != null && new File(realPath).exists()) { return realPath; } @@ -102,6 +97,11 @@ public class SymLinkUtil { return null; } + @Nullable + public static String resolveSymLink(@NotNull final String path) { + return resolveSymLink(new File(path)); + } + private interface Mediator { boolean isSymLink(@NotNull final String path) throws Exception;