From c76832fbc7af8674e49b9a89f3515f8aa8c3d8c1 Mon Sep 17 00:00:00 2001
From: Guillaume Martres <smarter@ubuntu.com>
Date: Mon, 9 Jan 2017 01:15:08 +0100
Subject: [PATCH] Avoid NullPointerException in sbt.ScalaOverrideTest

---
 ivy/src/main/scala/sbt/IvyScala.scala | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/ivy/src/main/scala/sbt/IvyScala.scala b/ivy/src/main/scala/sbt/IvyScala.scala
index 20490ce54..43b3f112e 100644
--- a/ivy/src/main/scala/sbt/IvyScala.scala
+++ b/ivy/src/main/scala/sbt/IvyScala.scala
@@ -67,12 +67,14 @@ private object IvyScala {
       // Do not rewrite the dependencies of Scala dependencies themselves, this prevents bootstrapping
       // a Scala compiler using another Scala compiler.
       def dependeeQualifies: Boolean =
-        dd.getParentRevisionId.getName match {
-          case name @ (CompilerID | LibraryID | ReflectID | ActorsID | ScalapID) =>
-            false
-          case _ =>
-            true
-        }
+        dd.getParentRevisionId == null || (
+          dd.getParentRevisionId.getName match {
+            case name @ (CompilerID | LibraryID | ReflectID | ActorsID | ScalapID) =>
+              false
+            case _ =>
+              true
+          }
+        )
       val transformer =
         new NamespaceTransformer {
           def transform(mrid: ModuleRevisionId): ModuleRevisionId = {