[jboss-cvs] JBossAS SVN: r75217 - projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2008-06-30 09:43:26 -0400 (Mon, 30 Jun 2008)
New Revision: 75217

Modified:
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/InstallScopeAction.java
Log:
Drop mdr creation, instead throw exception.

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/InstallScopeAction.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/InstallScopeAction.java	2008-06-30 13:41:15 UTC (rev 75216)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/InstallScopeAction.java	2008-06-30 13:43:26 UTC (rev 75217)
@@ -27,7 +27,6 @@
 import org.jboss.dependency.spi.ScopeInfo;
 import org.jboss.kernel.spi.dependency.KernelController;
 import org.jboss.kernel.spi.metadata.KernelMetaDataRepository;
-import org.jboss.metadata.plugins.loader.memory.MemoryMetaDataLoader;
 import org.jboss.metadata.spi.repository.MutableMetaDataRepository;
 import org.jboss.metadata.spi.retrieval.MetaDataItem;
 import org.jboss.metadata.spi.retrieval.MetaDataRetrieval;
@@ -76,13 +75,12 @@
 
          KernelController kernelController = (KernelController)controller;
          KernelMetaDataRepository repository = kernelController.getKernel().getMetaDataRepository();
+
          MutableMetaDataRepository mmdr = repository.getMetaDataRepository();
          MetaDataRetrieval mdr = mmdr.getMetaDataRetrieval(scopeKey);
          if (mdr == null)
-         {
-            mdr = new MemoryMetaDataLoader(scopeKey);
-            mmdr.addMetaDataRetrieval(mdr);
-         }
+            throw new IllegalArgumentException("No metadata retrieval for scope: " + scopeKey);
+
          MetaDataItem<ScopedKernelController> controllerItem = mdr.retrieveMetaData(ScopedKernelController.class);
          if (controllerItem == null)
             throw new IllegalArgumentException("Scoped controller should exist: " + scopeKey);