From 3a36a84808d6327952484d64f0bef052d955a2eb Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 17 Oct 2017 21:34:03 +0200 Subject: [PATCH] [updater] inlines potentially unsafe method ... to avoid accidental use; as suggested in PR #647 (https://github.com/JetBrains/intellij-community/pull/647) --- updater/src/com/intellij/updater/Utils.java | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/updater/src/com/intellij/updater/Utils.java b/updater/src/com/intellij/updater/Utils.java index 3867eb08c2e8..394012f969c4 100644 --- a/updater/src/com/intellij/updater/Utils.java +++ b/updater/src/com/intellij/updater/Utils.java @@ -24,16 +24,6 @@ public class Utils { return fileName.endsWith(".zip") || fileName.endsWith(".jar"); } - private static File findUniqueName(String path) { - int index = 0; - File myTempFile; - do { - myTempFile = new File(path + ".tmp." + index++); - } - while (myTempFile.exists()); - return myTempFile; - } - public static String findDirectory(long requiredFreeSpace) { String dir = System.getProperty("idea.updater.log"); if (dir == null || !isValidDir(dir, requiredFreeSpace)) { @@ -55,7 +45,14 @@ public class Utils { myTempDir = Files.createTempDirectory(Paths.get(findDirectory(REQUIRED_FREE_SPACE)), "idea.updater.files.").toFile(); Runner.logger().info("created working directory: " + myTempDir); } - return findUniqueName(myTempDir.getPath() + '/' + name); + + File myTempFile; + int index = 0; + do { + myTempFile = new File(myTempDir, name + ".tmp." + index++); + } + while (myTempFile.exists()); + return myTempFile; } public static void cleanup() throws IOException {