diff --git a/updater/src/com/intellij/updater/Patch.java b/updater/src/com/intellij/updater/Patch.java index 39d1b370e538..e934f46a1445 100644 --- a/updater/src/com/intellij/updater/Patch.java +++ b/updater/src/com/intellij/updater/Patch.java @@ -349,14 +349,9 @@ public class Patch { return new PatchFileCreator.ApplicationResult(false, appliedActions, t); } - File jre64 = new File(toDir.getAbsolutePath() + "/jre64"); - File jbr = new File(toDir.getAbsolutePath() + "/jbr"); - if (jbr.exists()) Runner.logger().info("jbr bundled: " + jbr.getAbsolutePath()); - if (jre64.exists()) Runner.logger().info("jre64 bundled: " + jre64.getAbsolutePath()); for (File directory : createdDirectories) { File[] children = directory.listFiles(); - if (children != null && pruningEmptyDir(toDir, directory, jre64, jbr) && - createdOptionalFiles.containsAll(Arrays.asList(children))) { + if (children != null && createdOptionalFiles.containsAll(Arrays.asList(children))) { Runner.logger().info("Pruning empty directory: " + directory); try { Utils.delete(directory); @@ -378,13 +373,6 @@ public class Patch { return new PatchFileCreator.ApplicationResult(true, appliedActions); } - private boolean pruningEmptyDir(File toDir, File directory, File jre64, File jbr) { - return ((!directory.getAbsolutePath().contains("jre64") || - (directory.getAbsolutePath().contains("jre64") && !jre64.exists())) && - (!directory.getAbsolutePath().contains("jbr") || - (directory.getAbsolutePath().contains("jbr") && !jbr.exists()))); - } - public void revert(List actions, File backupDir, File rootDir, UpdaterUI ui) throws IOException { Runner.logger().info("Reverting... [" + actions.size() + " actions]"); ui.startProcess("Reverting...");