Bug 457118 - OutOfMemoryError (Java Heap Space) when resolving bundles

Avoid to merge duplicate exported packages
see https://issues.apache.org/jira/browse/FELIX-4762

Bug: 457118
Change-Id: Ifdf099f06a83ff5b694a8a24d944c0eadc23fe75
Signed-off-by: Matthieu Helleboid <matthieu.helleboid@thalesgroup.com>

1 files changed, 25 insertions, 14 deletions

diff --git a/bundles/org.eclipse.osgi/container/src/org/apache/felix/resolver/ResolverImpl.java b/bundles/org.eclipse.osgi/container/src/org/apache/felix/resolver/ResolverImpl.java
index 230912a17..21721006d 100644
--- a/bundles/org.eclipse.osgi/container/src/org/apache/felix/resolver/ResolverImpl.java
+++ b/bundles/org.eclipse.osgi/container/src/org/apache/felix/resolver/ResolverImpl.java
@@ -732,7 +732,7 @@ public class ResolverImpl implements Resolver
 
             mergeCandidatePackages(
                 session.getContext(), resource, req, cap, resourcePkgMap, allCandidates,
-                new HashMap<Resource, List<Capability>>());
+                new HashMap<Resource, List<Capability>>(), new HashMap<Resource, List<Resource>>());
         }
 
         // Third, have all candidates to calculate their package spaces.
@@ -829,7 +829,7 @@ public class ResolverImpl implements Resolver
     private void mergeCandidatePackages(
         ResolveContext rc, Resource current, Requirement currentReq,
         Capability candCap, Map<Resource, Packages> resourcePkgMap,
-        Candidates allCandidates, Map<Resource, List<Capability>> cycles)
+        Candidates allCandidates, Map<Resource, List<Capability>> cycles, HashMap<Resource, List<Resource>> visitedRequiredBundlesMap)
     {
         List<Capability> cycleCaps = cycles.get(current);
         if (cycleCaps == null)
@@ -857,17 +857,28 @@ public class ResolverImpl implements Resolver
             // Get the candidate's package space to determine which packages
             // will be visible to the current resource.
             Packages candPkgs = resourcePkgMap.get(candCap.getResource());
-
-            // We have to merge all exported packages from the candidate,
-            // since the current resource requires it.
-            for (Entry<String, Blame> entry : candPkgs.m_exportedPkgs.entrySet())
+            
+            List<Resource> visitedRequiredBundles = visitedRequiredBundlesMap.get(current);
+            if (visitedRequiredBundles == null)
             {
-                mergeCandidatePackage(
-                    current,
-                    true,
-                    currentReq,
-                    entry.getValue().m_cap,
-                    resourcePkgMap);
+            	visitedRequiredBundles = new ArrayList<Resource>();
+            	visitedRequiredBundlesMap.put(current, visitedRequiredBundles);
+            }
+            if (!visitedRequiredBundles.contains(candCap.getResource()))
+            {
+            	visitedRequiredBundles.add(candCap.getResource());
+            	
+                // We have to merge all exported packages from the candidate,
+                // since the current resource requires it.
+                for (Entry<String, Blame> entry : candPkgs.m_exportedPkgs.entrySet())
+                {
+                    mergeCandidatePackage(
+                        current,
+                        true,
+                        currentReq,
+                        entry.getValue().m_cap,
+                        resourcePkgMap);
+                }
             }
 
             // If the candidate requires any other bundles with reexport visibility,
@@ -893,7 +904,7 @@ public class ResolverImpl implements Resolver
                                 w.getCapability(),
                                 resourcePkgMap,
                                 allCandidates,
-                                cycles);
+                                cycles, visitedRequiredBundlesMap);
                         }
                     }
                 }
@@ -918,7 +929,7 @@ public class ResolverImpl implements Resolver
                                 allCandidates.getCandidates(req).iterator().next(),
                                 resourcePkgMap,
                                 allCandidates,
-                                cycles);
+                                cycles, visitedRequiredBundlesMap);
                         }
                     }
                 }