Author: rickhall
Date: Fri Mar 11 14:45:56 2011
New Revision: 1080583
URL: http://svn.apache.org/viewvc?rev=1080583&view=rev
Log:
Only select root singleton if it is not already selected. (FELIX-2859)
Modified:
felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/Candidates.java
Modified:
felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/Candidates.java
URL:
http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/Candidates.java?rev=1080583&r1=1080582&r2=1080583&view=diff
==============================================================================
---
felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/Candidates.java
(original)
+++
felix/trunk/framework/src/main/java/org/apache/felix/framework/resolver/Candidates.java
Fri Mar 11 14:45:56 2011
@@ -502,7 +502,7 @@ public class Candidates
{
Module singleton = singletons.get(m_root.getSymbolicName());
singletons.put(m_root.getSymbolicName(), m_root);
- if (singleton != null)
+ if ((singleton != null) && !singleton.equals(m_root))
{
if (singleton.isResolved())
{
