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 2011/03/16 21:53:21 UTC
svn commit: r1082298 -
/felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
Author: rickhall
Date: Wed Mar 16 20:53:20 2011
New Revision: 1082298
URL: http://svn.apache.org/viewvc?rev=1082298&view=rev
Log:
Remove some unnecessary code. (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=1082298&r1=1082297&r2=1082298&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 Wed Mar 16 20:53:20 2011
@@ -231,11 +231,6 @@ public class ResolverImpl implements Res
ResolveException rethrow = null;
- // If the requested module is a fragment, then
- // ultimately we will verify the host.
- Requirement hostReq = getHostRequirement(module);
- Module target = module;
-
do
{
rethrow = null;
@@ -254,7 +249,7 @@ public class ResolverImpl implements Res
// this case like we do for a normal resolve.
calculatePackageSpaces(
- allCandidates.getWrappedHost(target), allCandidates, modulePkgMap,
+ allCandidates.getWrappedHost(module), allCandidates, modulePkgMap,
new HashMap(), new HashSet());
//System.out.println("+++ PACKAGE SPACES START +++");
//dumpModulePkgMap(modulePkgMap);
@@ -263,7 +258,7 @@ public class ResolverImpl implements Res
try
{
checkPackageSpaceConsistency(
- false, allCandidates.getWrappedHost(target),
+ false, allCandidates.getWrappedHost(module),
allCandidates, modulePkgMap, new HashMap());
}
catch (ResolveException ex)