From a07fabd95e14f4eb2367d23cf36efe789eed9ccf Mon Sep 17 00:00:00 2001 From: "Vladislav.Soroka" Date: Mon, 15 Jan 2018 22:39:40 +0300 Subject: [PATCH] Gradle: catch invalid path exceptions during sources/javadoc attachment --- .../service/project/GradleProjectResolverUtil.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolverUtil.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolverUtil.java index 48b3a7d72643..7a789c9dd41b 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolverUtil.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolverUtil.java @@ -348,12 +348,12 @@ public class GradleProjectResolverUtil { } for (String path : libraryData.getPaths(LibraryPathType.BINARY)) { - final Path file = Paths.get(path); - if (!FileUtil.isAncestor(gradleUserHomeDir.getPath(), path, true)) continue; - Path binaryFileParent = file.getParent(); - Path grandParentFile = binaryFileParent.getParent(); - try { + final Path file = Paths.get(path); + if (!FileUtil.isAncestor(gradleUserHomeDir.getPath(), path, true)) continue; + Path binaryFileParent = file.getParent(); + Path grandParentFile = binaryFileParent.getParent(); + final boolean[] sourceFound = {false}; final boolean[] docFound = {false}; Files.walkFileTree(grandParentFile, EnumSet.noneOf(FileVisitOption.class), 2, new SimpleFileVisitor() { @@ -367,7 +367,7 @@ public class GradleProjectResolverUtil { @Override public FileVisitResult visitFile(Path sourceCandidate, BasicFileAttributes attrs) throws IOException { - if(!sourceCandidate.getParent().getParent().equals(grandParentFile)) { + if (!sourceCandidate.getParent().getParent().equals(grandParentFile)) { return FileVisitResult.SKIP_SIBLINGS; } if (attrs.isRegularFile()) { @@ -387,7 +387,7 @@ public class GradleProjectResolverUtil { } }); } - catch (IOException e) { + catch (IOException | InvalidPathException e) { LOG.debug(e); } }