exit gen_fines_stop early if there is nothing to do; prevents (unneeded) secondary...
authorerickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Mon, 14 Mar 2011 17:42:20 +0000 (17:42 +0000)
committererickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Mon, 14 Mar 2011 17:42:20 +0000 (17:42 +0000)
git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@19740 dcc99617-32d9-48b4-a31d-7c20da2025e4

Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm

index 558be16..11468ef 100644 (file)
@@ -2951,13 +2951,13 @@ sub generate_fines_finish {
    my $self = shift;
    my $reservation = shift;
 
-   $self->{_gen_fines_req}->wait_complete if ($self->{_gen_fines_req});
-
-   my $id = $reservation ? $self->reservation->id : $self->circ->id;
+   return undef unless $self->{_gen_fines_req};
 
    $self->{_gen_fines_req}->wait_complete;
    delete($self->{_gen_fines_req});
 
+   my $id = $reservation ? $self->reservation->id : $self->circ->id;
+
    # refresh the circ in case the fine generator set the stop_fines field
    $self->reservation($self->editor->retrieve_booking_reservation($id)) if $reservation;
    $self->circ($self->editor->retrieve_action_circulation($id)) if !$reservation;