diff options
Diffstat (limited to 'container-di')
| -rw-r--r-- | container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/ComponentNode.scala | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/ComponentNode.scala b/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/ComponentNode.scala index 0dca08b020a..4261b874330 100644 --- a/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/ComponentNode.scala +++ b/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/ComponentNode.scala @@ -13,9 +13,6 @@ import com.yahoo.container.di.componentgraph.core.Node.equalEdges import com.yahoo.container.di.{ConfigKeyT, JavaAnnotation, createKey, makeClassCovariant, preserveStackTrace, removeStackTrace} import com.yahoo.vespa.config.ConfigKey -import scala.concurrent.ExecutionContext.Implicits.global -import scala.concurrent.duration._ -import scala.concurrent.{Await, Future, TimeoutException} import scala.language.postfixOps /** @@ -116,7 +113,7 @@ class ComponentNode(componentId: ComponentId, private def initId(component: AnyRef) = { def checkAndSetId(c: AbstractComponent) { if (c.hasInitializedId && c.getId != componentId ) - throw new IllegalStateException("Component with id '" + componentId + "' has set a bogus component id: '" + c.getId + "'") + throw new IllegalStateException("Component with id '" + componentId + "' has set a conflicting component id: '" + c.getId + "'") c.initId(componentId) } |