fix error handling to ensure reg/dereg completes

eucalyptus · Apr 20, 2011 · 42203d9 · 42203d9
1 parent d4a0d0d
commit 42203d9
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceTransitions.java b/clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceTransitions.java
@@ -239,7 +239,7 @@ public void leave( final ServiceConfiguration parent, final Completion transitio
                                                                                          try {
                                                                                           parent.lookupComponent( ).getBuilder( ).fireStart( parent );
                                                                                           transitionCallback.fire( );//TODO:GRZE: this is not complete.
-                                                                                        } catch ( ServiceRegistrationException ex ) {
+                                                                                        } catch ( Throwable ex ) {
                                                                                           LOG.error( "Transition failed on "
                                                                                                      + parent.lookupComponent( ).getName( )
                                                                                                      + " due to "
@@ -275,7 +275,7 @@ public void leave( ServiceConfiguration parent, Completion transitionCallback )
                                                                                          try {
                                                                                           parent.lookupComponent( ).getBuilder( ).fireEnable( parent );
                                                                                           transitionCallback.fire( );//TODO:GRZE: this is not complete.
-                                                                                        } catch ( ServiceRegistrationException ex ) {
+                                                                                        } catch ( Throwable ex ) {
                                                                                           LOG.error( "Transition failed on "
                                                                                                      + parent.lookupComponent( ).getName( )
                                                                                                      + " due to "
@@ -307,7 +307,7 @@ public void leave( ServiceConfiguration parent, Completion transitionCallback )
                                                                                          try {
                                                                                           parent.lookupComponent( ).getBuilder( ).fireDisable( parent );
                                                                                           transitionCallback.fire( );//TODO:GRZE: this is not complete.
-                                                                                        } catch ( ServiceRegistrationException ex ) {
+                                                                                        } catch ( Throwable ex ) {
                                                                                           LOG.error( "Transition failed on "
                                                                                                      + parent.lookupComponent( ).getName( )
                                                                                                      + " due to "
@@ -339,7 +339,7 @@ public void leave( ServiceConfiguration parent, Completion transitionCallback )
                                                                                          try {
                                                                                           parent.lookupComponent( ).getBuilder( ).fireStop( parent );
                                                                                           transitionCallback.fire( );//TODO:GRZE: this is not complete.
-                                                                                        } catch ( ServiceRegistrationException ex ) {
+                                                                                        } catch ( Throwable ex ) {
                                                                                           LOG.error( "Transition failed on "
                                                                                                      + parent.lookupComponent( ).getName( )
                                                                                                      + " due to "
@@ -395,7 +395,7 @@ public void leave( ServiceConfiguration parent, Completion transitionCallback )
                                                                                                if ( parent.lookupComponent( ).hasLocalService( ) ) {
                                                                                                  parent.lookupComponent( ).getBuilder( ).fireDisable( parent );
                                                                                                }
-                                                                                             } catch ( ServiceRegistrationException ex1 ) {
+                                                                                             } catch ( Throwable ex1 ) {
                                                                                                LOG.error( "Transition failed on "
                                                                                                           + parent.lookupComponent( ).getName( )
                                                                                                           + " due to "