Merge branch 'develop' into topic/build-server-protocol

2020-05-28 08:57:23 +02:00 · 2020-05-28 08:57:23 +02:00 · a498a20627
parent 0789fd7be6 1f3ac6c8cd
commit a498a20627
2 changed files with 2 additions and 4 deletions
--- a/.sbtopts
+++ b/.sbtopts
@ -1,3 +0,0 @@
-J-Xms2048M
-J-Xmx2048M
-J-Xss2M
--- a/main/src/main/scala/sbt/MainLoop.scala
+++ b/main/src/main/scala/sbt/MainLoop.scala
@ -151,7 +151,8 @@ object MainLoop {
        case Left(t)                   => state.handleError(t)
      }
    } catch {
-      case oom: OutOfMemoryError if oom.getMessage.contains("Metaspace") =>
+      case oom: OutOfMemoryError
+          if oom.getMessage != null && oom.getMessage.contains("Metaspace") =>
        System.gc() // Since we're under memory pressure, see if more can be freed with a manual gc.
        val isTestOrRun = state.remainingCommands.headOption.exists { exec =>
          val cmd = exec.commandLine