projects/ebul-cmp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Component state - Fixed various bugs in stop()

Browse source 
* Stopping only if inactive...
* Calling the wrong lifecycle action...
This commit is contained in:
Emmanuel BENOîT 2015-09-16 09:38:25 +02:00
parent 2fa4227e5a
commit 618204b8b1
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/info/ebenoit/ebul/cmp/ComponentState.java
View file

@ -156,9 +156,10 @@ public final class ComponentState
throw new IllegalStateException( "registry has failed" ); throw new IllegalStateException( "registry has failed" );
} }
this.wasActive = this.active; this.wasActive = this.active;
if ( this.active ) { if ( !this.active ) {
return null; return null;
} }
assert this.initialised;
for ( final ComponentState rdepState : this.reverseDependencies ) { for ( final ComponentState rdepState : this.reverseDependencies ) {
final Throwable t = rdepState.stop( ); final Throwable t = rdepState.stop( );
@ -168,7 +169,7 @@ public final class ComponentState
} }
try { try {
this.runLifecycleAction( LifecycleStage.START ); this.runLifecycleAction( LifecycleStage.STOP );
} catch ( final Throwable t ) { } catch ( final Throwable t ) {
return t; return t;
} }
@ -181,10 +182,6 @@ public final class ComponentState
public void restart( ) public void restart( )
throws IllegalStateException , ComponentRestartException throws IllegalStateException , ComponentRestartException
{ {
if ( this.registry.hasFailed( ) ) {
throw new IllegalStateException( "registry has failed" );
}
final Throwable t = this.stop( ); final Throwable t = this.stop( );
if ( t != null ) { if ( t != null ) {
throw new ComponentRestartException( "failed to stop" , t ); throw new ComponentRestartException( "failed to stop" , t );