more careful editor handling

git-svn-id: svn://svn.open-ils.org/ILS/trunk@5015 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/perlmods/OpenILS/SIP/Patron.pm b/Open-ILS/src/perlmods/OpenILS/SIP/Patron.pm
index 194a73b..17dc6f8 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/SIP/Patron.pm
+++ b/Open-ILS/src/perlmods/OpenILS/SIP/Patron.pm
@@ -429,12 +429,10 @@ sub block {
        my ($self, $card_retained, $blocked_card_msg) = @_;
 
        my $u = $self->{user};
-       my $e = $self->{editor};
+       my $e = $self->{editor} = OpenILS::SIP->reset_editor();
 
        syslog('LOG_INFO', "Blocking user %s", $u->card->barcode );
 
-       if(!$e->{xact}) { $e->reset; $e->{xact} = 1; }
-
        return $self if $u->card->active eq 'f';
 
        $u->card->active('f');

diff --git a/Open-ILS/src/perlmods/OpenILS/Utils/CStoreEditor.pm b/Open-ILS/src/perlmods/OpenILS/Utils/CStoreEditor.pm
index d8f0929..bcc2342 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Utils/CStoreEditor.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Utils/CStoreEditor.pm
@@ -109,7 +109,7 @@ sub session {
                $self->{session} = OpenSRF::AppSession->create('open-ils.cstore');
 
                if( ! $self->{session} ) {
-                       my $str = "Error creating storage session with OpenSRF::AppSession->create()!";
+                       my $str = "Error creating cstore session with OpenSRF::AppSession->create()!";
                        $self->log(E, $str);
                        throw OpenSRF::EX::ERROR ($str);
                }