Merge pull request #140 from oneill/handle-null-watchevent-context

Handle null WatchEvent context
sbt · Apr 7, 2018 · 471cf7b · 471cf7b
2 parents b35ee7d + 881e835
commit 471cf7b
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/io/src/main/scala/sbt/internal/io/SourceModificationWatch.scala b/io/src/main/scala/sbt/internal/io/SourceModificationWatch.scala
@@ -67,7 +67,10 @@ private[sbt] object SourceModificationWatch {
   private def expandEvent(event: (Path, WatchEvent[_])): (Path, WatchEvent.Kind[Path]) = {
     event match {
       case (base, ev) =>
-        val fullPath = base.resolve(ev.context().asInstanceOf[Path])
+        val fullPath = Option(ev.context().asInstanceOf[Path]) match {
+          case Some(path) => base.resolve(path)
+          case None       => base
+        }
         val kind = ev.kind().asInstanceOf[WatchEvent.Kind[Path]]
         (fullPath, kind)
     }