diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2014-02-25 18:34:25 -0800 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2014-02-25 18:34:25 -0800 |
| commit | 45d35d5739d05e602bc317739485693e0e9ff0b5 (patch) | |
| tree | 61801368d96662baff145d3271fd887ca104391c /rt/lib/RT/Util.pm | |
| parent | 662be3ece2ef8c7f05fcbfaa699d80a6a73ca110 (diff) | |
RT 4.0.19
Diffstat (limited to 'rt/lib/RT/Util.pm')
| -rw-r--r-- | rt/lib/RT/Util.pm | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/rt/lib/RT/Util.pm b/rt/lib/RT/Util.pm index 38c3c20c9..9720f1da8 100644 --- a/rt/lib/RT/Util.pm +++ b/rt/lib/RT/Util.pm @@ -2,7 +2,7 @@ # # COPYRIGHT: # -# This software is Copyright (c) 1996-2013 Best Practical Solutions, LLC +# This software is Copyright (c) 1996-2014 Best Practical Solutions, LLC # <sales@bestpractical.com> # # (Except where explicitly superseded by other copyright notices) @@ -65,8 +65,11 @@ sub safe_run_child (&) { # values. Instead we set values, eval code, check pid # on failure and reset values only in our original # process + my ($oldv_dbh, $oldv_rth); my $dbh = $RT::Handle->dbh; + $oldv_dbh = $dbh->{'InactiveDestroy'} if $dbh; $dbh->{'InactiveDestroy'} = 1 if $dbh; + $oldv_rth = $RT::Handle->{'DisconnectHandleOnDestroy'}; $RT::Handle->{'DisconnectHandleOnDestroy'} = 0; my ($reader, $writer); @@ -90,8 +93,8 @@ sub safe_run_child (&) { my $err = $@; $err =~ s/^Stack:.*$//ms; if ( $our_pid == $$ ) { - $dbh->{'InactiveDestroy'} = 0 if $dbh; - $RT::Handle->{'DisconnectHandleOnDestroy'} = 1; + $dbh->{'InactiveDestroy'} = $oldv_dbh if $dbh; + $RT::Handle->{'DisconnectHandleOnDestroy'} = $oldv_rth; die "System Error: $err"; } else { print $writer "System Error: $err"; @@ -104,8 +107,8 @@ sub safe_run_child (&) { my ($response) = $reader->getline; warn $response if $response; - $dbh->{'InactiveDestroy'} = 0 if $dbh; - $RT::Handle->{'DisconnectHandleOnDestroy'} = 1; + $dbh->{'InactiveDestroy'} = $oldv_dbh if $dbh; + $RT::Handle->{'DisconnectHandleOnDestroy'} = $oldv_rth; return $want? (@res) : $res[0]; } |