svn commit: r1078948 - /felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java

[ri...@apache.org]

Author: rickhall
Date: Mon Mar  7 21:02:42 2011
New Revision: 1078948

URL: http://svn.apache.org/viewvc?rev=1078948&view=rev
Log:
Need to unwrapped modules when creating dynamic wire. (FELIX-2858)

Modified:
    felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java

Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java?rev=1078948&r1=1078947&r2=1078948&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java Mon Mar  7 21:02:42 2011
@@ -469,8 +469,8 @@ public class ResolverImpl implements Res
         }
         cycle.add(module);
 
-        // Create a map of wires or proposed wired depending on whether
-        // the module is resolved or not.
+        // Create parallel arrays for requirement and proposed candidate
+        // capability or actual capability if module is resolved or not.
         List<Requirement> reqs = new ArrayList();
         List<Capability> caps = new ArrayList();
         boolean isDynamicImport = false;
@@ -1415,8 +1415,8 @@ public class ResolverImpl implements Res
                                 Capability.PACKAGE_NAMESPACE,
                                 new ArrayList(0),
                                 attrs),
-                            blame.m_cap.getModule(),
-                            blame.m_cap));
+                            getActualModule(blame.m_cap.getModule()),
+                            getActualCapability(blame.m_cap)));
                 }
             }
         }