From 3d7766701213dbc72d1a866208a7098616d2b542 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <goldmann@fedoraproject.org>
Date: Fri, 15 Jun 2012 07:58:11 +0200
Subject: [PATCH 2/2] JDK7 support

---
 .../java/org/jboss/osgi/resolver/v2/spi/AbstractEnvironment.java  |    5 +++--
 felix/src/main/java/org/jboss/osgi/resolver/v2/FelixResolver.java |    4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/api/src/main/java/org/jboss/osgi/resolver/v2/spi/AbstractEnvironment.java b/api/src/main/java/org/jboss/osgi/resolver/v2/spi/AbstractEnvironment.java
index 961344b..0e9843e 100644
--- a/api/src/main/java/org/jboss/osgi/resolver/v2/spi/AbstractEnvironment.java
+++ b/api/src/main/java/org/jboss/osgi/resolver/v2/spi/AbstractEnvironment.java
@@ -111,7 +111,8 @@ public abstract class AbstractEnvironment implements XEnvironment {
         log.debugf("Find providers: %s", req);
         SortedSet<Capability> result = new TreeSet<Capability>(getComparator());
         for (Resource res : resources) {
-            for (Capability cap : res.getCapabilities(req.getNamespace())) {
+            List<Capability> caps =  res.getCapabilities(req.getNamespace());
+            for (Capability cap : caps) {
                 if (req.matches(cap)) {
                     result.add(cap);
                 }
@@ -192,4 +193,4 @@ public abstract class AbstractEnvironment implements XEnvironment {
             applyWiring(res, wiring);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/felix/src/main/java/org/jboss/osgi/resolver/v2/FelixResolver.java b/felix/src/main/java/org/jboss/osgi/resolver/v2/FelixResolver.java
index 3678d67..be0fe10 100644
--- a/felix/src/main/java/org/jboss/osgi/resolver/v2/FelixResolver.java
+++ b/felix/src/main/java/org/jboss/osgi/resolver/v2/FelixResolver.java
@@ -53,7 +53,7 @@ public class FelixResolver implements Resolver {
     private ResolverImpl delegate = new ResolverImpl(new LoggerDelegate());
 
     @Override
-    public Map<Resource, List<Wire>> resolve(Environment environment, Collection<? extends Resource> mandatory, Collection<? extends Resource> optional) throws ResolutionException {
+    public Map<Resource, List<Wire>> resolve(Environment environment, Collection mandatory, Collection optional) throws ResolutionException {
         FelixEnvironment env = new EnvironmentDelegate(environment);
         log.debugf("Resolve: %s, %s", mandatory, optional);
         Map<Resource, List<Wire>> result = delegate.resolve(env, mandatory, optional);
@@ -99,4 +99,4 @@ public class FelixResolver implements Resolver {
             return environment.getWirings();
         }
     }
-}
\ No newline at end of file
+}
-- 
1.7.10.2