From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Tue, 9 Dec 2008 19:48:01 +0000 (+0000)
Subject: short-circuit unnecessary rollbacs and commits to prevent erroneous error messages
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=b834916c1860752cc9a21540dd4d1e32cf646cd3;p=Evergreen.git

short-circuit unnecessary rollbacs and commits to prevent erroneous error messages

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

diff --git a/Open-ILS/src/perlmods/OpenILS/Utils/CStoreEditor.pm b/Open-ILS/src/perlmods/OpenILS/Utils/CStoreEditor.pm
index abcb515692..7576b9bb7e 100644
--- a/Open-ILS/src/perlmods/OpenILS/Utils/CStoreEditor.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Utils/CStoreEditor.pm
@@ -208,8 +208,9 @@ sub xact_start {
 # -----------------------------------------------------------------------------
 sub xact_commit {
 	my $self = shift;
+    return unless $self->{xact_id};
 	$self->log(D, "comitting db session");
-	my $stat = $self->request($self->app.'.transaction.commit') if $self->{xact_id};
+	my $stat = $self->request($self->app.'.transaction.commit');
 	$self->log(E, "error comitting database transaction") unless $stat;
     delete $self->{xact_id};
 	return $stat;
@@ -220,9 +221,9 @@ sub xact_commit {
 # -----------------------------------------------------------------------------
 sub xact_rollback {
 	my $self = shift;
-   return unless $self->{session};
+   return unless $self->{session} and $self->{xact_id};
 	$self->log(I, "rolling back db session");
-	my $stat = $self->request($self->app.".transaction.rollback") if $self->{xact_id};
+	my $stat = $self->request($self->app.".transaction.rollback");
 	$self->log(E, "error rolling back database transaction") unless $stat;
     delete $self->{xact_id};
 	return $stat;