svn commit: r1349900 - /aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/OsgiIdentityCapability.java

[jw...@apache.org]

Author: jwross
Date: Wed Jun 13 15:09:46 2012
New Revision: 1349900

URL: http://svn.apache.org/viewvc?rev=1349900&view=rev
Log:
ARIES-825: Fixed issue where the full Bundle-SymbolicName header value, including parameters such as "singleton", instead of just the symbolic name was being used as the osgi.identity attribute in the corresponding capability of a bundle resource. This caused matches to fail that should have passed.

Modified:
    aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/OsgiIdentityCapability.java

Modified: aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/OsgiIdentityCapability.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/OsgiIdentityCapability.java?rev=1349900&r1=1349899&r2=1349900&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/OsgiIdentityCapability.java (original)
+++ aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/OsgiIdentityCapability.java Wed Jun 13 15:09:46 2012
@@ -19,6 +19,8 @@ import java.util.Map;
 
 import org.apache.aries.subsystem.core.archive.BundleManifest;
 import org.apache.aries.subsystem.core.archive.SubsystemManifest;
+import org.apache.aries.subsystem.core.archive.SymbolicNameHeader;
+import org.apache.aries.subsystem.core.archive.VersionHeader;
 import org.osgi.framework.Constants;
 import org.osgi.framework.Version;
 import org.osgi.framework.namespace.IdentityNamespace;
@@ -61,8 +63,8 @@ public class OsgiIdentityCapability exte
 	public OsgiIdentityCapability(Resource resource, BundleManifest manifest) {
 		this(
 				resource,
-				manifest.getHeader(Constants.BUNDLE_SYMBOLICNAME).getValue(),
-				Version.parseVersion(manifest.getHeader(Constants.BUNDLE_VERSION).getValue()),
+				((SymbolicNameHeader)manifest.getHeader(Constants.BUNDLE_SYMBOLICNAME)).getSymbolicName(),
+				((VersionHeader)manifest.getHeader(Constants.BUNDLE_VERSION)).getVersion(),
 				IdentityNamespace.TYPE_BUNDLE);
 	}