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 2015/07/13 17:20:04 UTC
svn commit: r1690735 -
/felix/trunk/resolver/src/main/java/org/apache/felix/resolver/Candidates.java
Author: gnodet
Date: Mon Jul 13 15:20:04 2015
New Revision: 1690735
URL: http://svn.apache.org/r1690735
Log:
[FELIX-4942] Fix some errors not being propagated properly
Modified:
felix/trunk/resolver/src/main/java/org/apache/felix/resolver/Candidates.java
Modified: felix/trunk/resolver/src/main/java/org/apache/felix/resolver/Candidates.java
URL: http://svn.apache.org/viewvc/felix/trunk/resolver/src/main/java/org/apache/felix/resolver/Candidates.java?rev=1690735&r1=1690734&r2=1690735&view=diff
==============================================================================
--- felix/trunk/resolver/src/main/java/org/apache/felix/resolver/Candidates.java (original)
+++ felix/trunk/resolver/src/main/java/org/apache/felix/resolver/Candidates.java Mon Jul 13 15:20:04 2015
@@ -531,6 +531,10 @@ class Candidates
{
if (result.error != null)
{
+ if (rethrow == null)
+ {
+ rethrow = result.error;
+ }
// Remove the candidate since we weren't able to
// populate its candidates.
itCandCap.remove();
@@ -1090,7 +1094,7 @@ class Candidates
PopulateResult result = m_populateResultCache.get(r.getResource());
result.success = false;
result.error =
- new MissingRequirementError(r);
+ new MissingRequirementError(r, m_populateResultCache.get(c.getResource()).error);
unresolvedResources.add(r.getResource());
}
}