You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pa...@apache.org on 2020/01/27 17:24:24 UTC

svn commit: r1873224 - in /felix/sandbox/pauls/connect/src: main/java/org/apache/felix/framework/BundleImpl.java test/java/org/apache/felix/framework/CollisionHookTest.java

Author: pauls
Date: Mon Jan 27 17:24:24 2020
New Revision: 1873224

URL: http://svn.apache.org/viewvc?rev=1873224&view=rev
Log:
Allow multiple bsn when restore from cache.

Modified:
    felix/sandbox/pauls/connect/src/main/java/org/apache/felix/framework/BundleImpl.java
    felix/sandbox/pauls/connect/src/test/java/org/apache/felix/framework/CollisionHookTest.java

Modified: felix/sandbox/pauls/connect/src/main/java/org/apache/felix/framework/BundleImpl.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pauls/connect/src/main/java/org/apache/felix/framework/BundleImpl.java?rev=1873224&r1=1873223&r2=1873224&view=diff
==============================================================================
--- felix/sandbox/pauls/connect/src/main/java/org/apache/felix/framework/BundleImpl.java (original)
+++ felix/sandbox/pauls/connect/src/main/java/org/apache/felix/framework/BundleImpl.java Mon Jan 27 17:24:24 2020
@@ -1340,7 +1340,7 @@ class BundleImpl implements Bundle, Bund
                     }
                 }
             }
-            if (!collisionCanditates.isEmpty())
+            if (!collisionCanditates.isEmpty() && m_installingBundle != null)
             {
                 throw new BundleException(
                     "Bundle symbolic name and version are not unique: "

Modified: felix/sandbox/pauls/connect/src/test/java/org/apache/felix/framework/CollisionHookTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pauls/connect/src/test/java/org/apache/felix/framework/CollisionHookTest.java?rev=1873224&r1=1873223&r2=1873224&view=diff
==============================================================================
--- felix/sandbox/pauls/connect/src/test/java/org/apache/felix/framework/CollisionHookTest.java (original)
+++ felix/sandbox/pauls/connect/src/test/java/org/apache/felix/framework/CollisionHookTest.java Mon Jan 27 17:24:24 2020
@@ -214,7 +214,7 @@ public class CollisionHookTest extends T
 
         try
         {
-            new BundleImpl(felixMock, null, archive);
+            new BundleImpl(felixMock, new BundleImpl(), archive);
             fail("Should have thrown a BundleException because the collision hook is not enabled");
         }
         catch (BundleException be)
@@ -290,7 +290,7 @@ public class CollisionHookTest extends T
 
         try
         {
-            new BundleImpl(felixMock, null, archive);
+            new BundleImpl(felixMock, new BundleImpl(), archive);
             fail("Should have thrown a BundleException because the installed bundle is not unique");
         }
         catch (BundleException be)