felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickh...@apache.org
Subject svn commit: r889441 - /felix/sandbox/rickhall/resolver/src/main/java/org/apache/felix/resolver/prototype/ProtoResolver.java
Date Thu, 10 Dec 2009 22:04:05 GMT
Author: rickhall
Date: Thu Dec 10 22:04:05 2009
New Revision: 889441

URL: http://svn.apache.org/viewvc?rev=889441&view=rev
Log:
Need to check namespace.

Modified:
    felix/sandbox/rickhall/resolver/src/main/java/org/apache/felix/resolver/prototype/ProtoResolver.java

Modified: felix/sandbox/rickhall/resolver/src/main/java/org/apache/felix/resolver/prototype/ProtoResolver.java
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/resolver/src/main/java/org/apache/felix/resolver/prototype/ProtoResolver.java?rev=889441&r1=889440&r2=889441&view=diff
==============================================================================
--- felix/sandbox/rickhall/resolver/src/main/java/org/apache/felix/resolver/prototype/ProtoResolver.java
(original)
+++ felix/sandbox/rickhall/resolver/src/main/java/org/apache/felix/resolver/prototype/ProtoResolver.java
Thu Dec 10 22:04:05 2009
@@ -743,14 +743,15 @@
 
             // If we couldn't find a wire for the package, then search the target
             // modules exports.
-            for (int expIdx = 0;
-                (capSource == null) && (expIdx < capTarget.getModule().getCapabilities().size());
-                expIdx++)
-            {
-                if (capTarget.getModule().getCapabilities().get(expIdx)
-                    .getAttribute(Capability.PACKAGE_ATTR).getValue().equals(uses.get(usesIdx)))
+            for (int capIdx = 0;
+                (capSource == null) && (capIdx < capTarget.getModule().getCapabilities().size());
+                capIdx++)
+            {
+                if (capTarget.getModule().getCapabilities().get(capIdx).getNamespace().equals(Capability.PACKAGE_NAMESPACE)
+                    && capTarget.getModule().getCapabilities().get(capIdx)
+                        .getAttribute(Capability.PACKAGE_ATTR).getValue().equals(uses.get(usesIdx)))
                 {
-                    capSource = capTarget.getModule().getCapabilities().get(expIdx);
+                    capSource = capTarget.getModule().getCapabilities().get(capIdx);
                 }
             }
 



Mime
View raw message