From 7fae5a062d496dd625f306c39d692747f7623ecb Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 21 Jul 2015 18:04:24 +0200 Subject: [PATCH] use org.intellij.lang.annotations.Flow to locate annotations.jar when building the classpath, because NotNull.class is also present in the Kotlin Java runtime --- .../util/src/com/intellij/openapi/application/PathManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/util/src/com/intellij/openapi/application/PathManager.java b/platform/util/src/com/intellij/openapi/application/PathManager.java index b643c052c26a..3706000961d8 100644 --- a/platform/util/src/com/intellij/openapi/application/PathManager.java +++ b/platform/util/src/com/intellij/openapi/application/PathManager.java @@ -24,6 +24,7 @@ import com.sun.jna.platform.FileUtils; import gnu.trove.THashSet; import org.apache.log4j.Appender; import org.apache.oro.text.regex.PatternMatcher; +import org.intellij.lang.annotations.Flow; import org.iq80.snappy.Snappy; import org.jdom.Document; import org.jetbrains.annotations.Contract; @@ -431,7 +432,7 @@ public class PathManager { public static Collection getUtilClassPath() { final Class[] classes = { PathManager.class, // module 'util' - NotNull.class, // module 'annotations' + Flow.class, // module 'annotations' SystemInfoRt.class, // module 'util-rt' Document.class, // jDOM Appender.class, // log4j