karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject karaf git commit: [KARAF-4970] Problem when restoring the wiring for bundles with attached fragments
Date Wed, 01 Feb 2017 10:35:18 GMT
Repository: karaf
Updated Branches:
  refs/heads/master 0e10a2976 -> d2062f7ee


[KARAF-4970] Problem when restoring the wiring for bundles with attached fragments

Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/d2062f7e
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/d2062f7e
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/d2062f7e

Branch: refs/heads/master
Commit: d2062f7eee9df12daf47deb56d960edbe7d3bc32
Parents: 0e10a29
Author: Guillaume Nodet <gnodet@apache.org>
Authored: Wed Feb 1 11:34:59 2017 +0100
Committer: Guillaume Nodet <gnodet@apache.org>
Committed: Wed Feb 1 11:35:13 2017 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/karaf/features/extension/Activator.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/d2062f7e/features/extension/src/main/java/org/apache/karaf/features/extension/Activator.java
----------------------------------------------------------------------
diff --git a/features/extension/src/main/java/org/apache/karaf/features/extension/Activator.java
b/features/extension/src/main/java/org/apache/karaf/features/extension/Activator.java
index 4c0385e..f0be0e8 100644
--- a/features/extension/src/main/java/org/apache/karaf/features/extension/Activator.java
+++ b/features/extension/src/main/java/org/apache/karaf/features/extension/Activator.java
@@ -115,7 +115,7 @@ public class Activator implements BundleActivator, ResolverHook, SynchronousBund
         for (Iterator<BundleCapability> candIter = candidates.iterator(); candIter.hasNext();)
{
             BundleCapability cand = candIter.next();
             if (cap != null && !cap.equals(getCapabilityId(cand))
-                    || cap == null && cand.getRevision() != requirement.getRevision())
{
+                    || cap == null && cand.getRevision().getBundle().getBundleId()
!= sourceId) {
                 candIter.remove();
             }
         }


Mime
View raw message