commit | bf5c8132d1849422031309b1b12dc45e6f8659ae | [log] [tgz] |
---|---|---|
author | Pierre De Rop <pderop@apache.org> | Fri Jun 11 05:57:57 2010 +0000 |
committer | Pierre De Rop <pderop@apache.org> | Fri Jun 11 05:57:57 2010 +0000 |
tree | 93d3966e48e15bf5f80ab27092e21708a8d5c312 | |
parent | 430b789140a9bc2062a024784633f9bc58ad0be1 [diff] |
cleanup git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@953570 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/multiple/ServiceProvider.java b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/multiple/ServiceProvider.java index cd3bfb1..e6af2ba 100644 --- a/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/multiple/ServiceProvider.java +++ b/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/multiple/ServiceProvider.java
@@ -39,18 +39,10 @@ m_serviceProvider2 = provider2; } - void unbind(ServiceProvider2 provider2) - { - m_sequencer.step(10); - } - @Start void start() { - if (m_serviceProvider2 != null) - { - m_sequencer.step(4); - } + m_serviceProvider2.step(4); m_sequencer.step(5); } @@ -60,6 +52,11 @@ m_sequencer.step(9); } + void unbind(ServiceProvider2 provider2) + { + m_sequencer.step(10); + } + public void doService() { m_sequencer.step(7);