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

Ignore ZipException in cache 

Fixes #3050
This commit is contained in:
Eugene Yokota 2017-04-22 05:10:23 -04:00
parent 239280f137
commit cfbff070e0
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
main-actions/src/main/scala/sbt/Sync.scala
View File

@ -3,12 +3,12 @@
*/ */
package sbt package sbt
import java.io.File import java.io.{ File, IOException }
import java.util.zip.ZipException
import sbt.internal.util.Relation import sbt.internal.util.Relation
import sbt.internal.io.TranslatedException
import sbt.util.CacheImplicits._ import sbt.util.CacheImplicits._
import sbt.util.{ FileInfo, CacheStore } import sbt.util.{ FileInfo, CacheStore }
import sbt.io.IO import sbt.io.IO
import sjsonnew.{ Builder, JsonFormat, Unbuilder, deserializationError } import sjsonnew.{ Builder, JsonFormat, Unbuilder, deserializationError }
@ -110,6 +110,17 @@ object Sync {
def readInfo[F <: FileInfo](store: CacheStore)( def readInfo[F <: FileInfo](store: CacheStore)(
implicit infoFormat: JsonFormat[F]): RelationInfo[F] = implicit infoFormat: JsonFormat[F]): RelationInfo[F] =
store.read(default = (Relation.empty[File, File], Map.empty[File, F])) try { readUncaught[F](store)(infoFormat) } catch {
case _: IOException => (Relation.empty[File, File], Map.empty[File, F])
case _: ZipException => (Relation.empty[File, File], Map.empty[File, F])
case e: TranslatedException =>
e.getCause match {
case _: ZipException => (Relation.empty[File, File], Map.empty[File, F])
case _ => throw e
}
}
private def readUncaught[F <: FileInfo](store: CacheStore)(
implicit infoFormat: JsonFormat[F]): RelationInfo[F] =
store.read(default = (Relation.empty[File, File], Map.empty[File, F]))
} }