You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2011/07/06 16:58:48 UTC
svn commit: r1143451 -
/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java
Author: rickhall
Date: Wed Jul 6 14:58:47 2011
New Revision: 1143451
URL: http://svn.apache.org/viewvc?rev=1143451&view=rev
Log:
Effectively rollback FELIX-2466 since OSGi R4.3 now allows
arbitrary attributes to be passed through from bundle header.
(FELIX-2950)
Modified:
felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java?rev=1143451&r1=1143450&r2=1143451&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java Wed Jul 6 14:58:47 2011
@@ -1267,14 +1267,13 @@ public class ManifestParser
// Create a require capability and return it.
String symName = (String) clauses.get(0).m_paths.get(0);
- Map<String, Object> attrs = new HashMap<String, Object>(2);
- attrs.put(BundleRevision.BUNDLE_NAMESPACE, symName);
- attrs.put(Constants.BUNDLE_VERSION_ATTRIBUTE, bundleVersion);
+ clauses.get(0).m_attrs.put(BundleRevision.BUNDLE_NAMESPACE, symName);
+ clauses.get(0).m_attrs.put(Constants.BUNDLE_VERSION_ATTRIBUTE, bundleVersion);
return new BundleCapabilityImpl(
owner,
BundleRevision.BUNDLE_NAMESPACE,
clauses.get(0).m_dirs,
- attrs);
+ clauses.get(0).m_attrs);
}
return null;