From 870a72ccd9dce5ff7112d493135f80a6dfc123e9 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Fri, 21 Apr 2017 15:36:57 +0200
Subject: [PATCH] do not call toCanonicalName twice

---
 .../intellij/openapi/project/impl/ProjectManagerImpl.java  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.java
index 6b8b025b0be7..838b72cea14b 100644
--- a/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.java
@@ -62,7 +62,6 @@ import javax.swing.*;
 import java.io.File;
 import java.io.IOException;
 import java.util.*;
-import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -485,13 +484,13 @@ public class ProjectManagerImpl extends ProjectManagerEx implements Disposable {
   @Override
   @Nullable
   public Project convertAndLoadProject(@NotNull String filePath) throws IOException {
-    final String fp = toCanonicalName(filePath);
-    final ConversionResult conversionResult = ConversionService.getInstance().convert(fp);
+    final String canonicalFilePath = toCanonicalName(filePath);
+    final ConversionResult conversionResult = ConversionService.getInstance().convert(canonicalFilePath);
     if (conversionResult.openingIsCanceled()) {
       return null;
     }
 
-    ProjectImpl project = createProject(null, toCanonicalName(filePath), false);
+    ProjectImpl project = createProject(null, canonicalFilePath, false);
     if (!loadProjectWithProgress(project)) return null;
     if (!conversionResult.conversionNotNeeded()) {
       StartupManager.getInstance(project).registerPostStartupActivity(() -> conversionResult.postStartupActivity(project));