From 4b9b3b07e7f5664c08c62ac4e27d30e41382c2a3 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <Nikolay.Krasko@jetbrains.com>
Date: Tue, 26 Jul 2016 19:14:57 +0300
Subject: [PATCH] Update to 162.1447.7

---
 .../test/testFramework/mock/MockFileManager.java   | 14 +++++++++++---
 update_dependencies.xml                            |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/MockFileManager.java b/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/MockFileManager.java
index 787a49df7d1..3156769b134 100644
--- a/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/MockFileManager.java
+++ b/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/MockFileManager.java
@@ -22,17 +22,25 @@ import com.intellij.psi.PsiFile;
 import com.intellij.psi.SingleRootFileViewProvider;
 import com.intellij.psi.impl.PsiManagerEx;
 import com.intellij.psi.impl.file.impl.FileManager;
-import com.intellij.util.containers.WeakFactoryMap;
+import com.intellij.util.containers.ConcurrentWeakFactoryMap;
+import com.intellij.util.containers.ContainerUtil;
+import com.intellij.util.containers.FactoryMap;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
+import java.util.Map;
 
 public class MockFileManager implements FileManager {
   private final PsiManagerEx myManager;
-  // in mock tests it's LightVirtualFile, they're only alive when they're referenced, 
+  // in mock tests it's LightVirtualFile, they're only alive when they're referenced,
   // and there can not be several instances representing the same file
-  private final WeakFactoryMap<VirtualFile, FileViewProvider> myViewProviders = new WeakFactoryMap<VirtualFile, FileViewProvider>() {
+  private final FactoryMap<VirtualFile, FileViewProvider> myViewProviders = new ConcurrentWeakFactoryMap<VirtualFile, FileViewProvider>() {
+    @Override
+    protected Map<VirtualFile, FileViewProvider> createMap() {
+      return ContainerUtil.createConcurrentWeakKeyWeakValueMap();
+    }
+
     @Override
     protected FileViewProvider create(VirtualFile key) {
       return new SingleRootFileViewProvider(myManager, key);
diff --git a/update_dependencies.xml b/update_dependencies.xml
index 9a431ab31fa..806e93fcddc 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -1,7 +1,7 @@
 <project name="Update Dependencies" default="update" xmlns:if="ant:if" xmlns:unless="ant:unless">
 
     <property name="automerge_dummy" value="This property is used to trick git merge. Do not delete empty lines around."/>
-    <property name="ideaVersion" value="162.1121.32"/>
+    <property name="ideaVersion" value="162.1447.7"/>
     <property name="idea.kotlin.branch" value="rc"/>