Merge pull request #204 from OlegYch/fix-deadlock

avoid deadlocks on spotty connections
sbt · Jan 18, 2018 · 2c6e388 · 2c6e388
2 parents 01bb0bd + d267b6f
commit 2c6e388
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/ParallelResolveEngine.scala b/ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/ParallelResolveEngine.scala
@@ -38,7 +38,10 @@ private[sbt] class ParallelResolveEngine(settings: ResolveEngineSettings,
     val allDownloads = dependencies.par.flatMap { dep =>
       if (!(dep.isCompletelyEvicted || dep.hasProblem) &&
           dep.getModuleRevision != null) {
-        ParArray(downloadNodeArtifacts(dep, artifactFilter, options))
+        //don't block in global ec to avoid deadlocks
+        scala.concurrent.blocking {
+          ParArray(downloadNodeArtifacts(dep, artifactFilter, options))
+        }
       } else ParArray.empty[DownloadResult]
     }