[jboss-cvs] JBossAS SVN: r100671 - projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle.

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

Author: alesj
Date: 2010-02-07 18:07:07 -0500 (Sun, 07 Feb 2010)
New Revision: 100671

Modified:
   projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/DescribeAction.java
   projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/PreInstallAction.java
Log:
[JBOSGI-141]; remove MDR::getMetaData workaround.

Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/DescribeAction.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/DescribeAction.java	2010-02-07 22:55:32 UTC (rev 100670)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/DescribeAction.java	2010-02-07 23:07:07 UTC (rev 100671)
@@ -45,7 +45,7 @@
       KernelMetaDataRepository repository = getRepository(context);
       ScopeKey contextScopeKey = context.getScopeInfo().getMutableScope();
       Scope scope = contextScopeKey.getScope(CommonLevels.INSTANCE);
-      ScopeKey key = new ScopeKey(scope);
+      ScopeKey key = new ScopeKey(scope).getOptimizedKey();
       MutableMetaDataRepository mutable = repository.getMetaDataRepository();
       MetaDataRetrieval retrieval = mutable.getMetaDataRetrieval(key);
       if (retrieval == null)

Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/PreInstallAction.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/PreInstallAction.java	2010-02-07 22:55:32 UTC (rev 100670)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/PreInstallAction.java	2010-02-07 23:07:07 UTC (rev 100671)
@@ -36,7 +36,6 @@
       if (install)
       {
          repository.addMetaData(context);
-         repository.getMetaData(context); // TODO - remove this once we fix it in MC core
       }
       else
       {