luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Adrien Piquerez 2020-05-28 08:57:23 +02:00 committed by GitHub
parent 0789fd7be6 1f3ac6c8cd
commit a498a20627
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.sbtopts
View File

@ -1,3 +0,0 @@
-J-Xms2048M
-J-Xmx2048M
-J-Xss2M

3
main/src/main/scala/sbt/MainLoop.scala
View File

@ -151,7 +151,8 @@ object MainLoop {
case Left(t) => state.handleError(t) case Left(t) => state.handleError(t)
} }
} catch { } 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. 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 isTestOrRun = state.remainingCommands.headOption.exists { exec =>
val cmd = exec.commandLine val cmd = exec.commandLine