1 files changed, 4 insertions, 2 deletions
diff --git a/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/ComponentGraph.scala b/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/ComponentGraph.scala
index 2bae9d67f27..f27dfc54b75 100644
--- a/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/ComponentGraph.scala
+++ b/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/ComponentGraph.scala
@@ -25,6 +25,8 @@ import com.yahoo.container.di.removeStackTrace
 import scala.util.Try
 import scala.Some
 
+import scala.language.existentials
+
 /**
  * @author tonytv
  * @author gjoranv
@@ -177,13 +179,13 @@ class ComponentGraph(val generation: Long = 0) {
         assert(wildCardType.getLowerBounds.isEmpty)
         assert(wildCardType.getUpperBounds.size == 1)
         wildCardType.getUpperBounds.head.asInstanceOf[Class[AnyRef]]
-      case clazz: Class[AnyRef] => clazz
+      case clazz: Class[_] => clazz
       case typeVariable: TypeVariable[_] =>
         throw new RuntimeException("Can't create ComponentRegistry of unknown type variable " + typeVariable)
     }
 
     componentRegistryNodes.find(_.componentClass == componentType).
-      getOrElse(newComponentRegistryNode(componentClass))
+      getOrElse(newComponentRegistryNode(componentClass.asInstanceOf[Class[AnyRef]]))
   }
 
   def handleConfigParameter(node : ComponentNode,  clazz: Class[_]) : ConfigKeyT = {