You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2010/01/25 20:06:03 UTC
svn commit: r902933 -
/felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
Author: rickhall
Date: Mon Jan 25 19:06:03 2010
New Revision: 902933
URL: http://svn.apache.org/viewvc?rev=902933&view=rev
Log:
Fix a bug in calculating required packages.
Modified:
felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
Modified: felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java?rev=902933&r1=902932&r2=902933&view=diff
==============================================================================
--- felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java (original)
+++ felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java Mon Jan 25 19:06:03 2010
@@ -898,7 +898,7 @@
rbEntry.getKey(),
rbEntry.getValue().getModule(),
rbEntry.getValue(),
- pkgs.getRequiredPackages(rbEntry.getValue())));
+ pkgs.getRequiredPackages(rbEntry.getValue().getModule())));
}
}
}
@@ -966,14 +966,14 @@
m_usedPkgs.putAll(packages.m_usedPkgs);
}
- public List<String> getRequiredPackages(Capability source)
+ public List<String> getRequiredPackages(Module source)
{
List<String> pkgs = new ArrayList();
for (Entry<String, List<Blame>> entry : m_requiredPkgs.entrySet())
{
for (Blame blame : entry.getValue())
{
- if (blame.m_cap.equals(source))
+ if (blame.m_cap.getModule().equals(source))
{
pkgs.add((String)
blame.m_cap.getAttribute(Capability.PACKAGE_ATTR).getValue());