azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Flaky ConcurrentModificationException in NewMultiplatformProjectImportingTest.testFileCollectionDependency fixed

Browse Source
This commit is contained in:
Vladimir Ilmov
2020-01-15 16:01:31 +01:00
parent 3cad1bbb51
commit a2a3ca0558
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/ExternalSystemImportingTestCase.java
+9
View File
@@ -36,6 +36,7 @@ import com.intellij.openapi.roots.*;
import com.intellij.openapi.util.Couple; import com.intellij.openapi.util.Couple;
import com.intellij.openapi.util.Ref; import com.intellij.openapi.util.Ref;
import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.containers.ConcurrentWeakKeySoftValueHashMap;
import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.ContainerUtilRt; import com.intellij.util.containers.ContainerUtilRt;
import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NonNls;
@@ -150,6 +151,14 @@ public abstract class ExternalSystemImportingTestCase extends ExternalSystemTest
field.getName()); field.getName());
} }
} }
else if (fieldValue instanceof Map && ! (fieldValue instanceof ConcurrentWeakKeySoftValueHashMap)) {
for (Map.Entry e : ((Map<Object, Object>) fieldValue).entrySet()) {
saveToProcessIfRequired(processed, toProcess, referencingObjects, referencingFieldNames, nextObject, e.getKey(),
field.getName());
saveToProcessIfRequired(processed, toProcess, referencingObjects, referencingFieldNames, nextObject, e.getValue(),
"value" + field.getName());
}
}
else { else {
saveToProcessIfRequired(processed, toProcess, referencingObjects, referencingFieldNames, nextObject, fieldValue, saveToProcessIfRequired(processed, toProcess, referencingObjects, referencingFieldNames, nextObject, fieldValue,
field.getName()); field.getName());