From 3dc3ccd1ed9be6a4cfe01d3b941d052639c38566 Mon Sep 17 00:00:00 2001 From: miker Date: Tue, 27 Jan 2009 02:23:18 +0000 Subject: [PATCH] for now use die instead of throw git-svn-id: svn://svn.open-ils.org/ILS/trunk@11990 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../OpenILS/Application/Trigger/Event.pm | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Trigger/Event.pm b/Open-ILS/src/perlmods/OpenILS/Application/Trigger/Event.pm index 8aaae2e3ec..4fe79a4bb5 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Trigger/Event.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Trigger/Event.pm @@ -27,7 +27,7 @@ sub cleanup { my $self = shift; if (defined $self->reacted) { - $self->update_state( 'cleaning') || throw 'Unable to update event state'; + $self->update_state( 'cleaning') || die 'Unable to update event state'; try { my $cleanup = $self->reacted ? $self->definition->cleanup_success : $self->definition->cleanup_failure; $self->cleanedup( @@ -38,13 +38,13 @@ sub cleanup { ); } otherwise { $log->error( shift() ); - $self->update_state( 'error' ) || throw 'Unable to update event state'; + $self->update_state( 'error' ) || die 'Unable to update event state'; }; if ($self->cleanedup) { - $self->update_state( 'complete' ) || throw 'Unable to update event state'; + $self->update_state( 'complete' ) || die 'Unable to update event state'; } else { - $self->update_state( 'error' ) || throw 'Unable to update event state'; + $self->update_state( 'error' ) || die 'Unable to update event state'; } } else { @@ -60,7 +60,7 @@ sub react { if ($self->definition->group_field) { # can't react individually to a grouped definition $self->{reacted} = undef; } else { - $self->update_state( 'reacting') || throw 'Unable to update event state'; + $self->update_state( 'reacting') || die 'Unable to update event state'; try { $self->reacted( OpenILS::Application::Trigger::ModRunner @@ -70,13 +70,13 @@ sub react { ); } otherwise { $log->error( shift() ); - $self->update_state( 'error' ) || throw 'Unable to update event state'; + $self->update_state( 'error' ) || die 'Unable to update event state'; }; if (defined $self->reacted) { - $self->update_state( 'reacted' ) || throw 'Unable to update event state'; + $self->update_state( 'reacted' ) || die 'Unable to update event state'; } else { - $self->update_state( 'error' ) || throw 'Unable to update event state'; + $self->update_state( 'error' ) || die 'Unable to update event state'; } } } else { @@ -91,7 +91,7 @@ sub validate { return $self if (defined $self->valid); if ($self->build_environment->environment->{complete}) { - $self->update_state( 'validating') || throw 'Unable to update event state'; + $self->update_state( 'validating') || die 'Unable to update event state'; try { $self->valid( OpenILS::Application::Trigger::ModRunner @@ -101,17 +101,17 @@ sub validate { ); } otherwise { $log->error( shift() ); - $self->update_state( 'error' ) || throw 'Unable to update event state'; + $self->update_state( 'error' ) || die 'Unable to update event state'; }; if (defined $self->valid) { if ($self->valid) { - $self->update_state( 'valid' ) || throw 'Unable to update event state'; + $self->update_state( 'valid' ) || die 'Unable to update event state'; } else { - $self->update_state( 'invalid' ) || throw 'Unable to update event state'; + $self->update_state( 'invalid' ) || die 'Unable to update event state'; } } else { - $self->update_state( 'error' ) || throw 'Unable to update event state'; + $self->update_state( 'error' ) || die 'Unable to update event state'; } } else { $self->{valid} = undef @@ -220,7 +220,7 @@ sub build_environment { my $self = shift; return $self if ($self->environment->{complete}); - $self->update_state( 'collecting') || throw 'Unable to update event state'; + $self->update_state( 'collecting') || die 'Unable to update event state'; try { $self->definition( $self->editor->retrieve_action_trigger_event_definition( $self->event->event_def ) ); @@ -259,13 +259,13 @@ sub build_environment { $self->environment->{complete} = 1; } otherwise { $log->error( shift() ); - $self->update_state( 'error' ) || throw 'Unable to update event state'; + $self->update_state( 'error' ) || die 'Unable to update event state'; }; - if ($self->environment->{complete}) - $self->update_state( 'collected' ) || throw 'Unable to update event state'; + if ($self->environment->{complete}) { + $self->update_state( 'collected' ) || die 'Unable to update event state'; } else { - $self->update_state( 'error' ) || throw 'Unable to update event state'; + $self->update_state( 'error' ) || die 'Unable to update event state'; } return $self; -- 2.43.2