commit 863795a787ebd38181fd82d53f2a4bcda95445c0
author Richard S. Hall <rickhall@apache.org> Tue Sep 20 20:14:48 2011 +0000
committer Richard S. Hall <rickhall@apache.org> Tue Sep 20 20:14:48 2011 +0000
tree 4e4bc0f81afbdfb8dc399b291308d2127578e648
parent 1392d77d158398824c2727dbcfb4565ccd984bd6

Implement support for allowing duplicate BSN/version pairs. (FELIX-3124)


git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1173329 13f79535-47bb-0310-9956-ffa450edef68

framework/src/main/java/org/apache/felix/framework/BundleImpl.java

diff --git a/framework/src/main/java/org/apache/felix/framework/BundleImpl.java b/framework/src/main/java/org/apache/felix/framework/BundleImpl.java
index 4d2e009..e89f727 100644
--- a/framework/src/main/java/org/apache/felix/framework/BundleImpl.java
+++ b/framework/src/main/java/org/apache/felix/framework/BundleImpl.java
@@ -1198,8 +1198,15 @@
             headerMap,
             m_archive.getCurrentRevision().getContent());
 
-        // Verify that the bundle symbolic name + version is unique.
-        if (revision.getManifestVersion().equals("2"))
+        // For R4 bundles, verify that the bundle symbolic name + version
+        // is unique unless this check has been disabled.
+        String allowMultiple =
+            (String) getFramework().getConfig().get(Constants.FRAMEWORK_BSNVERSION);
+        allowMultiple = (allowMultiple == null)
+            ? Constants.FRAMEWORK_BSNVERSION_SINGLE
+            : allowMultiple;
+        if (revision.getManifestVersion().equals("2")
+            && !allowMultiple.equals(Constants.FRAMEWORK_BSNVERSION_MULTIPLE))
         {
             Version bundleVersion = revision.getVersion();
             bundleVersion = (bundleVersion == null) ? Version.emptyVersion : bundleVersion;