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

Java classfile analysis: log the problematic URL when IO.urlAsFile throws an exception. Ref #564.

This commit is contained in:
Mark Harrah 2012-10-15 12:42:28 -04:00
parent b3b943653b
commit 6354b174e8
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
util/classfile/Analyze.scala
View File

@ -11,6 +11,7 @@ import java.io.File
import java.lang.annotation.Annotation import java.lang.annotation.Annotation
import java.lang.reflect.Method import java.lang.reflect.Method
import java.lang.reflect.Modifier.{STATIC, PUBLIC, ABSTRACT} import java.lang.reflect.Modifier.{STATIC, PUBLIC, ABSTRACT}
import java.net.URL
private[sbt] object Analyze private[sbt] object Analyze
{ {
@ -45,7 +46,7 @@ private[sbt] object Analyze
{ {
trapAndLog(log) trapAndLog(log)
{ {
for (url <- Option(loader.getResource(tpe.replace('.', '/') + ClassExt)); file <- IO.urlAsFile(url)) for (url <- Option(loader.getResource(tpe.replace('.', '/') + ClassExt)); file <- urlAsFile(url, log))
{ {
if(url.getProtocol == "jar") if(url.getProtocol == "jar")
analysis.binaryDependency(file, tpe, source) analysis.binaryDependency(file, tpe, source)
@ -73,6 +74,12 @@ private[sbt] object Analyze
analysis.endSource(source) analysis.endSource(source)
} }
} }
private[this] def urlAsFile(url: URL, log: Logger): Option[File] =
try IO.urlAsFile(url)
catch { case e: Exception =>
log.warn("Could not convert URL '" + url.toExternalForm + "' to File: " + e.toString)
None
}
private def trapAndLog(log: Logger)(execute: => Unit) private def trapAndLog(log: Logger)(execute: => Unit)
{ {
try { execute } try { execute }