Skip to content

Commit 7481970

Browse files
committed
maven: check nullability on user data associated with MavenFullCompilerClasspath #SCL-22253 fixed
1 parent 09c7600 commit 7481970

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

sbt/sbt-impl/test/org/jetbrains/sbt/project/SbtOptsTest.scala

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,4 @@ class SbtOptsTest {
102102
doTest(""" -d -sbt-dir "" """, Seq("-d", "-sbt-dir", ""))
103103
doTest("-d -sbt-dir -dummy", Seq("-d", "-sbt-dir", "-dummy"))
104104
}
105-
106-
import org.junit.Assert.assertTrue
107-
@Test
108-
def dummyFailingTest(): Unit = {
109-
assertTrue(false)
110-
}
111-
112105
}

scala/integration/maven/src/org/jetbrains/plugins/scala/project/maven/ScalaMavenImporter.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ final class ScalaMavenImporter extends MavenImporter("org.scala-tools", "maven-s
157157
scalaLibraryToMarkAsSdk.foreach {
158158
case Some((scalaLibrary, scalaLibraryVersion)) =>
159159
val compilerClasspathFull = module.getProject.getUserData(MavenFullCompilerClasspathKey)
160+
if (compilerClasspathFull == null) return
160161

161162
val compilerBridgeBinaryJar =
162163
ScalaSdkUtils.compilerBridgeJarName(scalaLibraryVersion.presentation).flatMap { bridgeJarName =>

0 commit comments

Comments
 (0)