You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pd...@apache.org on 2010/06/24 00:07:22 UTC
svn commit: r957368 - in
/felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspectlifecycle:
ServiceProvider.java ServiceProviderAspect.java
Author: pderop
Date: Wed Jun 23 22:07:22 2010
New Revision: 957368
URL: http://svn.apache.org/viewvc?rev=957368&view=rev
Log:
fixed wrong steps
Modified:
felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspectlifecycle/ServiceProvider.java
felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspectlifecycle/ServiceProviderAspect.java
Modified: felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspectlifecycle/ServiceProvider.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspectlifecycle/ServiceProvider.java?rev=957368&r1=957367&r2=957368&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspectlifecycle/ServiceProvider.java (original)
+++ felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspectlifecycle/ServiceProvider.java Wed Jun 23 22:07:22 2010
@@ -30,6 +30,6 @@ public class ServiceProvider implements
public void run()
{
- m_sequencer.step(1);
+ m_sequencer.step();
}
}
Modified: felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspectlifecycle/ServiceProviderAspect.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspectlifecycle/ServiceProviderAspect.java?rev=957368&r1=957367&r2=957368&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspectlifecycle/ServiceProviderAspect.java (original)
+++ felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspectlifecycle/ServiceProviderAspect.java Wed Jun 23 22:07:22 2010
@@ -63,12 +63,13 @@ public class ServiceProviderAspect imple
@Stop()
void stop()
{
- m_sequencer.step(5);
+ // At this point, the AspectLifecycleTest class has been rebound to the original ServiceProvider.
+ m_sequencer.step(6);
}
@Destroy
void destroy()
{
- m_sequencer.step(6);
+ m_sequencer.step(7);
}
}