You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2014/09/18 08:53:39 UTC
svn commit: r1625895 -
/felix/trunk/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java
Author: gnodet
Date: Thu Sep 18 06:53:39 2014
New Revision: 1625895
URL: http://svn.apache.org/r1625895
Log:
[FELIX-4642] NPE in the resolver when substituting
Modified:
felix/trunk/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java
Modified: felix/trunk/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java?rev=1625895&r1=1625894&r2=1625895&view=diff
==============================================================================
--- felix/trunk/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java (original)
+++ felix/trunk/resolver/src/main/java/org/apache/felix/resolver/ResolverImpl.java Thu Sep 18 06:53:39 2014
@@ -1520,7 +1520,7 @@ public class ResolverImpl implements Res
for (Candidates existingPerm : permutations)
{
List<Capability> existingPermCands = existingPerm.getCandidates(req);
- if (!existingPermCands.get(0).equals(candidates.get(0)))
+ if (existingPermCands != null && !existingPermCands.get(0).equals(candidates.get(0)))
{
permutated = true;
}