svn commit: r1091664 - /felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceLifecycleHandler.java

[pderop]

Author: pderop
Date: Wed Apr 13 06:22:49 2011
New Revision: 1091664

URL: http://svn.apache.org/viewvc?rev=1091664&view=rev
Log:
The extra dependencies must be added in one shot, outside the loop which 
configure named dependencies.

Modified:
    
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceLifecycleHandler.java

Modified: 
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceLifecycleHandler.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceLifecycleHandler.java?rev=1091664&r1=1091663&r2=1091664&view=diff
==============================================================================
--- 
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceLifecycleHandler.java
 (original)
+++ 
felix/trunk/dependencymanager/runtime/src/main/java/org/apache/felix/dm/runtime/ServiceLifecycleHandler.java
 Wed Apr 13 06:22:49 2011
@@ -208,14 +208,14 @@ public class ServiceLifecycleHandler
                                    dependency, m_srvMeta);
                 Dependency d = depBuilder.build(m_bundle, dm, true);
                 m_namedDeps.add(d);
-            }
-            
-            // Add all extra dependencies in one shot, in order to calculate 
state changes for all dependencies at a time.
-            if (m_namedDeps.size() > 0) {
-                Log.instance().info("ServiceLifecycleHandler.init: adding 
extra/named dependencies %s",
-                                    m_namedDeps);
-                service.add(m_namedDeps);
-            }
+            }            
+        }
+        
+        // Add all extra dependencies in one shot, in order to calculate state 
changes for all dependencies at a time.
+        if (m_namedDeps.size() > 0) {
+            Log.instance().info("ServiceLifecycleHandler.init: adding 
extra/named dependencies %s",
+                                m_namedDeps);
+            service.add(m_namedDeps);
         }
     }