commit 98473fdd27ab80bc360e22b4c468bbc9cf04b0c4
author Richard S. Hall <rickhall@apache.org> Fri Mar 11 14:45:56 2011 +0000
committer Richard S. Hall <rickhall@apache.org> Fri Mar 11 14:45:56 2011 +0000
tree dd838227af11291785adb9f71289b9449299b606
parent 6331033b62abd74020888521ce9933fd90116dee

Only select root singleton if it is not already selected. (FELIX-2859)


git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1080583 13f79535-47bb-0310-9956-ffa450edef68

framework/src/main/java/org/apache/felix/framework/resolver/Candidates.java

diff --git a/framework/src/main/java/org/apache/felix/framework/resolver/Candidates.java b/framework/src/main/java/org/apache/felix/framework/resolver/Candidates.java
index ac95e7d..e75ea05 100644
--- a/framework/src/main/java/org/apache/felix/framework/resolver/Candidates.java
+++ b/framework/src/main/java/org/apache/felix/framework/resolver/Candidates.java
@@ -502,7 +502,7 @@
         {
             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())
                 {