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/09/08 20:58:22 UTC
svn commit: r995193 - in
/felix/trunk/framework/src/main/java/org/apache/felix/framework: Felix.java
resolver/ResolverImpl.java
Author: rickhall
Date: Wed Sep 8 18:58:21 2010
New Revision: 995193
URL: http://svn.apache.org/viewvc?rev=995193&view=rev
Log:
Use isEmpty().
Modified:
felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java
felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java?rev=995193&r1=995192&r2=995193&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java Wed Sep 8 18:58:21 2010
@@ -4103,7 +4103,7 @@ m_logger.log(Logger.LOG_DEBUG, "DYNAMIC
// If the module doesn't have dynamic imports, then just return
// immediately.
List<Requirement> dynamics = module.getDynamicRequirements();
- if ((dynamics == null) || (dynamics.size() == 0))
+ if ((dynamics == null) || dynamics.isEmpty())
{
return false;
}
@@ -4140,12 +4140,7 @@ m_logger.log(Logger.LOG_DEBUG, "DYNAMIC
module, Capability.PACKAGE_NAMESPACE, dirs, attrs);
Set<Capability> candidates = m_resolverState.getCandidates(module, req, false);
- if (candidates.size() == 0)
- {
- return false;
- }
-
- return true;
+ return !candidates.isEmpty();
}
private void markResolvedModules(Map<Module, List<Wire>> wireMap)
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=995193&r1=995192&r2=995193&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 Sep 8 18:58:21 2010
@@ -233,7 +233,7 @@ public class ResolverImpl implements Res
// If the module doesn't have dynamic imports, then just return
// immediately.
List<Requirement> dynamics = module.getDynamicRequirements();
- if ((dynamics == null) || (dynamics.size() == 0))
+ if ((dynamics == null) || dynamics.isEmpty())
{
return null;
}
@@ -446,7 +446,7 @@ public class ResolverImpl implements Res
// If there are no candidates for the current requirement
// and it is not optional, then create, cache, and throw
// a resolve exception.
- if ((candidates.size() == 0) && !req.isOptional())
+ if (candidates.isEmpty() && !req.isOptional())
{
String msg = "Unable to resolve " + module
+ ": missing requirement " + req;
@@ -518,7 +518,7 @@ public class ResolverImpl implements Res
}
}
- if (candidates.size() == 0)
+ if (candidates.isEmpty())
{
candidateMap.remove(dynReq);
if (rethrow == null)