Use sys.props to avoid null

disneystreaming · Feb 25, 2022 · ff06057 · ff06057
1 parent a2ec5cc
commit ff06057
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/modules/framework/src-jvm/RunnerCompat.scala b/modules/framework/src-jvm/RunnerCompat.scala
@@ -120,11 +120,10 @@ trait RunnerCompat[F[_]] { self: sbt.testing.Runner =>
                   gate)
     stillRunning.set(sbtTasks.size)
 
-    val maybeTimeout: Option[FiniteDuration] = Try(System.getProperty("weaver.test.startupTimeout"))
-      .toOption
-      .flatMap(Option(_))
-      .flatMap(timeoutString => Try(timeoutString.toInt).toOption)
-      .map(_.seconds)
+    val maybeTimeout: Option[FiniteDuration] =
+      sys.props.get("weaver.test.startupTimeout")
+        .flatMap(timeoutString => Try(timeoutString.toInt).toOption)
+        .map(_.seconds)
 
     // Waiting for the resources to be allocated.
     scala.concurrent.blocking {